From 0af89f96a1d2de14390e14bc19fa5a4a71bc8741 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 29 Dec 2014 23:00:44 +0100 Subject: [PATCH] Build numbering --- BuildFiles/Packaging/scripts/repackage-build | 2 +- BuildFiles/Packaging/scripts/repackage-one | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BuildFiles/Packaging/scripts/repackage-build b/BuildFiles/Packaging/scripts/repackage-build index 3c369d61..e848a516 100755 --- a/BuildFiles/Packaging/scripts/repackage-build +++ b/BuildFiles/Packaging/scripts/repackage-build @@ -32,7 +32,7 @@ fi BUILDID=$(cat ../lastbuild/swarmops/$DROPFOLDER/BuildIdentity.txt | tr -d ' \r') COMMITID=$(cat ../lastbuild/swarmops/$DROPFOLDER/CommitIdentity.txt | tr -d ' \r') -BUILDID=$(echo $BUILDID | cut -d '.' -f 1-3).$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID)-$(echo $COMMITID | cut -c 1-7) echo "" echo "Packaging Swarmops, branch '$DROPFOLDER', build $BUILDID." diff --git a/BuildFiles/Packaging/scripts/repackage-one b/BuildFiles/Packaging/scripts/repackage-one index 7542e02d..03365a28 100755 --- a/BuildFiles/Packaging/scripts/repackage-one +++ b/BuildFiles/Packaging/scripts/repackage-one @@ -62,7 +62,7 @@ cp ../lastbuild/swarmops/$DROPFOLDER/CommitIdentity.txt ./CommitIdentity.txt BUILDID=$(cat BuildIdentity.txt | tr -d ' \r') COMMITID=$(cat CommitIdentity.txt | tr -d ' \r') -BUILDID=$(echo $BUILDID | cut -d '.' -f 1-3).$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID)-$(echo $COMMITID | cut -c 1-7) echo "" echo "Building package $PACKAGENAME $BUILDID."