Fix example that could fail in certain circumstances
[asterisk/asterisk.git] / build_tools / make_version
index 73e9864..e90932e 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f ${1}/.version ]; then
-       cat ${1}/.version
+    cat ${1}/.version
 elif [ -d .svn ]; then
     PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
     BRANCH=0
@@ -10,65 +10,70 @@ elif [ -d .svn ]; then
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
-    BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
+    INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
+    if [ -z "${INTEGRATED}" ] ; then
+        INTEGRATED=svnmerge-integrated
+    fi
+
+    BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
 
     if [ "${PARTS}" = "trunk" ] ; then
-       echo SVN-trunk-r${REV}
-       exit 0
+        echo SVN-trunk-r${REV}
+        exit 0
     fi
 
     for PART in $PARTS ; do
-      if [ ${TAG} != 0 ] ; then
-         if [ "${PART}" = "autotag_for_be" ] ; then
-             continue
-         fi
-         if [ "${PART}" = "autotag_for_sx00i" ] ; then
-             continue
-         fi
-         RESULT="${PART}"
-         break
-      fi
+        if [ ${TAG} != 0 ] ; then
+            if [ "${PART}" = "autotag_for_be" ] ; then
+                continue
+            fi
+            if [ "${PART}" = "autotag_for_sx00i" ] ; then
+                continue
+            fi
+            RESULT="${PART}"
+            break
+        fi
 
-      if [ ${BRANCH} != 0 ] ; then
-         if [ -z ${RESULT} ] ; then
-           RESULT="${PART}"
-         else
-           RESULT="${RESULT}-${PART}"
-         fi
-         break
-      fi
+        if [ ${BRANCH} != 0 ] ; then
+            if [ -z "${RESULT}" ] ; then
+                RESULT="${PART}"
+            else
+                RESULT="${RESULT}-${PART}"
+            fi
+            break
+        fi
 
-      if [ ${TEAM} != 0 ] ; then
-         if [ -z ${RESULT} ] ; then
-           RESULT="${PART}"
-         else
-           RESULT="${RESULT}-${PART}"
-         fi
-         continue
-      fi
+        if [ ${TEAM} != 0 ] ; then
+            if [ -z "${RESULT}" ] ; then
+                RESULT="${PART}"
+            else
+                RESULT="${RESULT}-${PART}"
+            fi
+            continue
+        fi
 
-      if [ "${PART}" = "branches" ] ; then
-         BRANCH=1
-         RESULT="branch"
-         continue
-      fi
+        if [ "${PART}" = "branches" ] ; then
+            BRANCH=1
+            RESULT="branch"
+            continue
+        fi
 
-      if [ "${PART}" = "tags" ] ; then
-         TAG=1
-         continue
-      fi
+        if [ "${PART}" = "tags" ] ; then
+            TAG=1
+            continue
+        fi
 
-      if [ "${PART}" = "team" ] ; then
-         TEAM=1
-         continue
-      fi
+        if [ "${PART}" = "team" ] ; then
+            TEAM=1
+            continue
+        fi
     done
 
     if [ ${TAG} != 0 ] ; then
-       echo ${RESULT}
+        echo ${RESULT}
     else
-       echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
+        echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
 else
-  echo "UNKNOWN__and_probably_unsupported"
+    echo "UNKNOWN__and_probably_unsupported"
 fi