From: Jason Parker <jparker@digium.com>
Date: Wed, 22 Aug 2007 18:06:00 +0000 (+0000)
Subject: Fix a bashism (we explicitly request /bin/sh).
X-Git-Tag: 1.4.12~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2787080d941f0db1f0080e6898f1e275efb6016;p=thirdparty%2Fasterisk.git

Fix a bashism (we explicitly request /bin/sh).
Remove some oddly placed quotes I found in passing.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@80302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/build_tools/make_version b/build_tools/make_version
index a29fe2b322..0cde99d21b 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -14,7 +14,7 @@ elif [ -d .svn ]; then
     
     if [ "${PARTS}" = "trunk" ]
 	then
-	echo SVN-'trunk'-r${REV}
+	echo SVN-trunk-r${REV}
 	exit 0
     fi
     
@@ -28,13 +28,23 @@ elif [ -d .svn ]; then
       
       if [ ${BRANCH} != 0 ]
 	  then
-	  RESULT="${RESULT}-${PART}"
+	  if [ -z ${RESULT} ]
+	    then
+	    RESULT="${PART}"
+	  else
+	    RESULT="${RESULT}-${PART}"
+	  fi
 	  break
       fi
       
       if [ ${TEAM} != 0 ]
 	  then
-	  RESULT="${RESULT}-${PART}"
+	  if [ -z ${RESULT} ]
+	    then
+	    RESULT="${PART}"
+	  else
+	    RESULT="${RESULT}-${PART}"
+	  fi
 	  continue
       fi
       
@@ -62,6 +72,6 @@ elif [ -d .svn ]; then
 	then
 	echo ${RESULT}
 	else
-	echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}}
+	echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
 fi