mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	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: https://origsvn.digium.com/svn/asterisk/trunk@80303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user