[asterisk-commits] qwell: trunk r80303 - in /trunk: ./ build_tools/make_version

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Aug 22 13:06:28 2007
New Revision: 80303

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80303
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_version

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version?view=diff&rev=80303&r1=80302&r2=80303
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Wed Aug 22 13:06:28 2007
@@ -14,7 +14,7 @@
     
     if [ "${PARTS}" = "trunk" ]
 	then
-	echo SVN-'trunk'-r${REV}
+	echo SVN-trunk-r${REV}
 	exit 0
     fi
     
@@ -28,13 +28,23 @@
       
       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 @@
 	then
 	echo ${RESULT}
 	else
-	echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}}
+	echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
 fi