removed some debugs

[citadel.git] / citadel / scripts / mk_svn_revision.sh

diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh
index 35ad0dc94af1ed068e4a8206b8520a5645e2f6f4..9a68d27bdcad44fe08ab4c39e8c421e9341af427 100755 (executable)
--- a/citadel/scripts/mk_svn_revision.sh
+++ b/citadel/scripts/mk_svn_revision.sh
@@ -12,7 +12,6 @@ CUR_DIR=`pwd`
 C_FILE="$CUR_DIR/svn_revision.c"
 H_FILE="$CUR_DIR/svn_revision.h"
 
-
 # determine if this code base came from subversion.
 if test -d $SRC_DIR/.svn  ; then
        echo "have subversion repository"
@@ -24,13 +23,15 @@ if test -d $SRC_DIR/.svn  ; then
                CAN_BUILD_SVN_REVISION="yes"
        fi
 else 
-    if git status> /dev/null 2>&1; then 
+    if test -d $SRC_DIR/../.git  ; then
        echo "have Git repository."
-       TAG=`git rev-parse HEAD`
-       BRANCH="`git show-branch |sed 's;\[\(.*\)\].*;\1;'`"
-       BUILD="GIT: $BRANCH : $TAG"
+       BUILD=`/usr/bin/env git log -1 --pretty=%h . `
        echo "This code base git-revision: $BUILD"
        CAN_BUILD_SVN_REVISION="yes"
+    else
+       if test -f $C_FILE; then
+           exit
+       fi
     fi
 fi
 
@@ -69,7 +70,7 @@ cat <<EOF > $C_FILE
  
 const char *svn_revision (void)
 {
-       const char *SVN_Version = "**UNKNOWN** Built from source without svn and no $C_FILE accompanying";
+       const char *SVN_Version = "(unknown)";
        return SVN_Version;
 }
 EOF