r212: fix the svk stuff

metze

diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 69b24a137b419061d6b477eb5cfe24119be09663..f66e1cc1accdb55698bbc829a57e3fd16f273098 100755 (executable)
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -51,17 +51,18 @@ fi
 
 
 if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
-    HAVESVN=yes
-    TMP_SVN_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || HAVESVN=no) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
+    HAVESVN=no
+    svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
+    TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
     if test x"${HAVESVN}" = x"no";then
-       HAVESVK=yes
-       TMP_SVK_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null || HAVESVK=no) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
-       TMP_SVK_REVISION_STR="${TMP_SVK_REVISION}-${USER}@${HOSTNAME}"
+       HAVESVK=no
+       svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
+       TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
     fi
 
     if test x"${HAVESVN}" = x"yes";then
-           SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-${TMP_SVN_REVISION}"
-           echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_SVN_REVISION}" >> $OUTPUT_FILE
+           SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-${TMP_REVISION}"
+           echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}" >> $OUTPUT_FILE
     elif test x"${HAVESVK}" = x"yes";then
            SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}"
     else