(svn r14277) -Change [Makefile]: Use [ -n ... ] instead of using return values from grep and read in findversion.sh.
authormatthijs
Tue, 09 Sep 2008 10:48:04 +0000
changeset 10096 d4ce0c2732bc
parent 10095 e9b9244afcd7
child 10097 9ef63102fa6f
(svn r14277) -Change [Makefile]: Use [ -n ... ] instead of using return values from grep and read in findversion.sh.
findversion.sh
--- a/findversion.sh	Mon Sep 08 19:20:39 2008 +0000
+++ b/findversion.sh	Tue Sep 09 10:48:04 2008 +0000
@@ -65,7 +65,7 @@
 MODIFIED="0"
 if [ -d "$ROOT_DIR/.svn" ]; then
 	# We are an svn checkout
-	if svnversion "$SRC_DIR" | grep 'M' > /dev/null; then
+	if [ -n "`svnversion \"$SRC_DIR\" | grep 'M'`" ]; then
 		MODIFIED="2"
 	fi
 	# Find the revision like: rXXXXM-branch
@@ -79,7 +79,7 @@
 	fi
 elif [ -d "$ROOT_DIR/.git" ]; then
 	# We are a git checkout
-	if git diff-index HEAD "$SRC_DIR" | read dummy; then
+	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8`
@@ -88,7 +88,7 @@
 	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
-	if hg status "$SRC_DIR" | grep -v '^?' | read dummy; then
+	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C hg tip 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8`