From: Kevin P. Fleming Date: Sat, 17 Dec 2005 02:22:24 +0000 (+0000) Subject: Merged revision 7510 via svnmerge from X-Git-Tag: 1.4.0-beta1~3186 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cc6ad4880dd2b599063edf0770ac9acc2986a17;p=thirdparty%2Fasterisk.git Merged revision 7510 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r7510 | kpfleming | 2005-12-16 20:20:04 -0600 (Fri, 16 Dec 2005) | 2 lines fix some buglet when building team branch version strings ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7512 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name index b3af1492a1..d77bc3f9cd 100755 --- a/build_tools/make_svn_branch_name +++ b/build_tools/make_svn_branch_name @@ -1,6 +1,6 @@ #!/bin/sh -PARTS=`LANG=C 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 @@ -47,4 +47,4 @@ do fi done -echo ${RESULT}-r${REV} +echo ${RESULT##-}-r${REV}