summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-14 13:45:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:17 -0500
commit5201ae9b317a10377bc210228dc492a32eb2638c (patch)
tree2d487cf3e590e6e061d78d9cd43bf12961ed891d
parentbfbe809a6f9543599af0177ca954d49865166f9e (diff)
downloadsamba-5201ae9b317a10377bc210228dc492a32eb2638c.tar.gz
samba-5201ae9b317a10377bc210228dc492a32eb2638c.tar.bz2
samba-5201ae9b317a10377bc210228dc492a32eb2638c.zip
r212: fix the svk stuff
metze (This used to be commit 995f54b208eed93930e177ff3f3da44ba4d53bed)
-rwxr-xr-xsource4/script/mkversion.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 69b24a137b..f66e1cc1ac 100755
--- a/source4/script/mkversion.sh
+++ b/source4/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