Merged revision 7510 via svnmerge from
[asterisk/asterisk.git] / build_tools / make_svn_branch_name
index e24ba44..d77bc3f 100755 (executable)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-PARTS=`svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :'`
+PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
 
-REV=`svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'`
+REV=`svnversion -c . | cut -d: -f2`
 
-if [ "${PARTS}" == "trunk" ]
+if [ "${PARTS}" = "trunk" ]
 then
     echo 'trunk'-r${REV}
     exit 0
@@ -26,25 +26,25 @@ do
       continue
   fi
 
-  if [ "${PART}" == "branches" ]
+  if [ "${PART}" = "branches" ]
   then
       BRANCH=1
       RESULT="branch"
       continue
   fi
 
-  if [ "${PART}" == "tags" ]
+  if [ "${PART}" = "tags" ]
   then
       BRANCH=1
       RESULT="tag"
       continue
   fi
 
-  if [ "${PART}" == "team" ]
+  if [ "${PART}" = "team" ]
   then
       TEAM=1
       continue
   fi
 done
 
-echo ${RESULT}-r${REV}
+echo ${RESULT##-}-r${REV}