simplify/cleanup the scripts

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92122 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/make_version

@@ -12,24 +12,19 @@ elif [ -d .svn ]; then
 
     BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
 
-    if [ "${PARTS}" = "trunk" ]
+    if [ "${PARTS}" = "trunk" ] ; then
-	then
 	echo SVN-trunk-r${REV}
 	exit 0
     fi
 
-    for PART in $PARTS
+    for PART in $PARTS ; do
-      do
+      if [ ${TAG} != 0 ] ; then
-      if [ ${TAG} != 0 ]
-	  then
 	  RESULT="${PART}"
 	  break
       fi
 
-      if [ ${BRANCH} != 0 ]
+      if [ ${BRANCH} != 0 ] ; then
-	  then
+	  if [ -z ${RESULT} ] ; then
-	  if [ -z ${RESULT} ]
-	    then
 	    RESULT="${PART}"
 	  else
 	    RESULT="${RESULT}-${PART}"
@@ -37,10 +32,8 @@ elif [ -d .svn ]; then
 	  break
       fi
 
-      if [ ${TEAM} != 0 ]
+      if [ ${TEAM} != 0 ] ; then
-	  then
+	  if [ -z ${RESULT} ] ; then
-	  if [ -z ${RESULT} ]
-	    then
 	    RESULT="${PART}"
 	  else
 	    RESULT="${RESULT}-${PART}"
@@ -48,28 +41,24 @@ elif [ -d .svn ]; then
 	  continue
       fi
 
-      if [ "${PART}" = "branches" ]
+      if [ "${PART}" = "branches" ] ; then
-	  then
 	  BRANCH=1
 	  RESULT="branch"
 	  continue
       fi
 
-      if [ "${PART}" = "tags" ]
+      if [ "${PART}" = "tags" ] ; then
-	  then
 	  TAG=1
 	  continue
       fi
 
-      if [ "${PART}" = "team" ]
+      if [ "${PART}" = "team" ] ; then
-	  then
 	  TEAM=1
 	  continue
       fi
     done
 
-    if [ ${TAG} != 0 ]
+    if [ ${TAG} != 0 ] ; then
-	then
 	echo ${RESULT}
     else
 	echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}

build_tools/make_version_h

@@ -1,25 +1,17 @@
 #!/bin/sh
 if [ ! -f ../.flavor ]; then
-    cat << END
+    EXTRA=""
-/*
- * version.h 
- * Automatically generated
- */
-#define ASTERISK_VERSION "${ASTERISKVERSION}"
-#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
-
-END
 else
     aadkver=`cat ../.version`
     aadkflavor=`cat ../.flavor`
-    cat << END
+    EXTRA=" (${aadkflavor} ${aadkver})"
+fi
+cat << END
 /*
  * version.h 
  * Automatically generated
  */
-#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor} ${aadkver})"
+#define ASTERISK_VERSION "${ASTERISKVERSION}${EXTRA}"
 #define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
 
 END
-fi
-