[dss-commits] r8757 - dss/trunk/tools

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-09-10 11:06:01 +0200 (Thu, 10 Sep 2009)
New Revision: 8757

Modified:
   dss/trunk/tools/dss_gen_version_unix.sh
Log:
dss_gen_version_unix: remove check for svn binary

Chances are that if there's a .svn directory (or .git or .hg), the user has the
proper tools installed

Modified: dss/trunk/tools/dss_gen_version_unix.sh
===================================================================
--- dss/trunk/tools/dss_gen_version_unix.sh	2009-09-10 09:05:58 UTC (rev 8756)
+++ dss/trunk/tools/dss_gen_version_unix.sh	2009-09-10 09:06:01 UTC (rev 8757)
@@ -16,26 +16,24 @@
 
 rcs_rev="undefined"
 rcs_root="undefined"
-if [ -n "$(which svn)" ]; then
-  if [ -d $BASEDIR/.svn ]; then
-     rcs_rev=$(svnversion $BASEDIR)
-     rcs_root=$(svn info $BASEDIR|grep ^URL:|sed -e 's|URL:\s*||')
-  elif [ -d $BASEDIR/.git ]; then
-    if [ -d $BASEDIR/.git/svn ]; then
-     rcs_rev=svn-$(git svn info|grep ^Revision:| sed -e 's|Revision:\s*||')+
-     rcs_root=$(git svn info|grep ^URL:|sed -e 's|URL:\s*||')    
-    else
-      rcs_root=$(git branch|grep ^*)
-    fi
-    rcs_rev="${rcs_rev}git:$(git rev-parse HEAD)"
-    rcs_st=$(git status $BASEDIR|grep modified:)
-    if [ -n "$rcs_st" ]; then
-      rcs_rev="$rcs_rev-dirty"
-    fi
-  elif [ -d $BASEDIR/.hg ]; then
-     rcs_rev=$(hg identify) # already contains the '+' marked when modified
-     rcs_root=$(hg branch)
-  fi 
+if [ -d $BASEDIR/.svn ]; then
+  rcs_rev=$(svnversion $BASEDIR)
+  rcs_root=$(svn info $BASEDIR|grep ^URL:|sed -e 's|URL:\s*||')
+elif [ -d $BASEDIR/.git ]; then
+  if [ -d $BASEDIR/.git/svn ]; then
+    rcs_rev=svn-$(git svn info|grep ^Revision:| sed -e 's|Revision:\s*||')+
+    rcs_root=$(git svn info|grep ^URL:|sed -e 's|URL:\s*||')    
+  else
+    rcs_root=$(git branch|grep ^*)
+  fi
+  rcs_rev="${rcs_rev}git:$(git rev-parse HEAD)"
+  rcs_st=$(git status $BASEDIR|grep modified:)
+  if [ -n "$rcs_st" ]; then
+    rcs_rev="$rcs_rev-dirty"
+  fi
+elif [ -d $BASEDIR/.hg ]; then
+  rcs_rev=$(hg identify) # already contains the '+' marked when modified
+  rcs_root=$(hg branch)
 fi