[asterisk-commits] kpfleming: branch 1.2 r55868 - /branches/1.2/build_tools/make_svn_branch_name

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb 21 08:03:11 2007
New Revision: 55868

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55868
Log:
use new tag version script

Modified:
    branches/1.2/build_tools/make_svn_branch_name

Modified: branches/1.2/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/branches/1.2/build_tools/make_svn_branch_name?view=diff&rev=55868&r1=55867&r2=55868
==============================================================================
--- branches/1.2/build_tools/make_svn_branch_name (original)
+++ branches/1.2/build_tools/make_svn_branch_name Wed Feb 21 08:03:11 2007
@@ -3,6 +3,7 @@
 PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
+TAG=0
 
 REV=`svnversion -c . | cut -d: -f2`
 
@@ -14,6 +15,12 @@
 
 for PART in $PARTS
 do
+  if [ ${TAG} != 0 ]
+  then
+      RESULT="${PART}"
+      break
+  fi
+
   if [ ${BRANCH} != 0 ]
   then
       RESULT="${RESULT}-${PART}"
@@ -35,8 +42,7 @@
 
   if [ "${PART}" = "tags" ]
   then
-      BRANCH=1
-      RESULT="tag"
+      TAG=1
       continue
   fi
 
@@ -47,4 +53,9 @@
   fi
 done
 
-echo ${RESULT##-}-r${REV}
+if [ ${TAG} != 0 ]
+then
+    echo ${RESULT}
+else
+    echo ${RESULT##-}-r${REV}
+fi