From a55445159b607a9ca74fcf7c2e991483e8f43641 Mon Sep 17 00:00:00 2001
From: qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 22 Aug 2007 18:06:28 +0000
Subject: Merged revisions 80302 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80302 | qwell | 2007-08-22 13:06:00 -0500 (Wed, 22 Aug 2007) | 3 lines

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

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80303 f38db490-d61c-443f-a65b-d21fe96a405b
---
 build_tools/make_version | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'build_tools')

diff --git a/build_tools/make_version b/build_tools/make_version
index a29fe2b32..0cde99d21 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
-- 
cgit v1.2.3