[or-cvs] r10094: Shell tweaks suggested by weasel. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-02 15:13:15 -0400 (Wed, 02 May 2007)
New Revision: 10094

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r12634 at catbus:  nickm | 2007-05-02 15:13:13 -0400
 Shell tweaks suggested by weasel.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12634] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-05-02 18:59:57 UTC (rev 10093)
+++ tor/trunk/src/or/Makefile.am	2007-05-02 19:13:15 UTC (rev 10094)
@@ -43,8 +43,7 @@
 	  svn info ../.. |              			\
 	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
 	     || true;                                           \
-	else                                                    \
-	if test x`which svk` != x -a -d ~/.svk; then            \
+	elif test x`which svk` != x && test -d ~/.svk; then          \
           location=../..;                                       \
           rev=x;                                                \
           while test x$$rev = xx; do                            \
@@ -67,11 +66,11 @@
             echo \"$$rev\" > micro-revision.tmp;                \
           fi;                                                   \
         fi;                                                     \
-	fi;                                                     \
 	if test ! -f micro-revision.tmp; then			\
 	  echo '""' > micro-revision.tmp;			\
 	fi;                                                     \
-	if test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \
+	if test ! -f micro-revision.i || \
+          test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \
 	  mv micro-revision.tmp micro-revision.i;               \
 	fi