From: Ari Johnson <ari@cobramush.org>
Date: Fri, 2 Mar 2007 16:36:17 +0000 (+0000)
Subject: Added branch name to non-release dist tarballs
X-Git-Tag: 0.73~91
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=c157ebde527926e91496c24eaf1b2e5e10b924c7;p=cobramush.git

Added branch name to non-release dist tarballs
---

diff --git a/scripts/makedist.sh b/scripts/makedist.sh
index 97957cf..e0a7553 100644
--- a/scripts/makedist.sh
+++ b/scripts/makedist.sh
@@ -12,7 +12,8 @@ echo "that all files are up-to-date"
 # Step 2: determine version
 echo "Determining version..."
 VERSION=`grep VERSION hdrs/version.h | sed 's/^.*"\(.*\)".*$/\1/'`
-echo "Version is $VERSION"
+BRANCH=`grep VBRANCH hdrs/version.h | sed 's/^.*"\(.*\)".*$/\1/'`
+echo "Version is $VERSION, branch is $BRANCH"
 
 # Step 3: copy everything into a temporary directory
 WD=`pwd`
@@ -30,7 +31,12 @@ rm x??
 
 # Step 4: make tarball
 echo "Making tarball..."
-TARBALL="cobramush-$VERSION.tar.gz"
+if [ "$BRANCH" = "release" ]; then
+    BRANCHNAME=""
+else
+    BRANCHNAME="-$BRANCH"
+fi
+TARBALL="cobramush-$VERSION$BRANCHNAME.tar.gz"
 tar -czf "$WD/$TARBALL" cobramush
 
 # Step 5: clean up