[or-cvs] r10439: Test for ~/.svk/local, not ~/.svk. Eschew use of test -a and (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-01 06:20:37 -0400 (Fri, 01 Jun 2007)
New Revision: 10439

Modified:
   tor/trunk/
   tor/trunk/acinclude.m4
   tor/trunk/configure.in
   tor/trunk/src/or/Makefile.am
Log:
 r13131 at catbus:  nickm | 2007-06-01 06:20:29 -0400
 Test for ~/.svk/local, not ~/.svk.  Eschew use of test -a and test -o.  Bulletproof more against odd shells.



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

Modified: tor/trunk/acinclude.m4
===================================================================
--- tor/trunk/acinclude.m4	2007-06-01 10:20:33 UTC (rev 10438)
+++ tor/trunk/acinclude.m4	2007-06-01 10:20:37 UTC (rev 10439)
@@ -45,19 +45,19 @@
 if test x$2 = xdevpkg; then
   h=" headers for"
 fi
-if test -f /etc/debian_version -a x"$tor_$1_$2_debian" != x; then
+if test -f /etc/debian_version && test x"$tor_$1_$2_debian" != x; then
   AC_WARN([On Debian, you can install$h $1 using "apt-get install $tor_$1_$2_debian"])
   if test x"$tor_$1_$2_debian" != x"$tor_$1_devpkg_debian"; then 
     AC_WARN([   You will probably need $tor_$1_devpkg_debian too.])
   fi 
 fi
-if test -f /etc/fedora-release -a x"$tor_$1_$2_redhat" != x; then
+if test -f /etc/fedora-release && test x"$tor_$1_$2_redhat" != x; then
   AC_WARN([On Fedora Core, you can install$h $1 using "yum install $tor_$1_$2_redhat"])
   if test x"$tor_$1_$2_redhat != x"$tor_$1_devpkg_redhat"; then 
     AC_WARN([   You will probably need $tor_$1_devpkg_redhat too.])
   fi 
 else
-  if test -f /etc/redhat-release -a x"$tor_$1_$2_redhat" != x; then
+  if test -f /etc/redhat-release && test x"$tor_$1_$2_redhat" != x; then
     AC_WARN([On most Redhat-based systems, you can get$h $1 by installing the $tor_$1_$2_redhat" RPM package])
     if test x"$tor_$1_$2_redhat" != x"$tor_$1_devpkg_redhat"; then 
       AC_WARN([   You will probably need $tor_$1_devpkg_redhat too.])
@@ -98,7 +98,7 @@
     fi
 
     # Skip the directory if it isn't there.
-    if test ! -d "$tor_trydir" -a "$tor_trydir" != "(system)"; then
+    if test ! -d "$tor_trydir" && test "$tor_trydir" != "(system)"; then
       continue;
     fi
 

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-06-01 10:20:33 UTC (rev 10438)
+++ tor/trunk/configure.in	2007-06-01 10:20:37 UTC (rev 10439)
@@ -274,7 +274,7 @@
 
 if test x$transparent = xtrue ; then
    transparent_ok=0
-   if test x$net_if_found = x1 -a x$net_pfvar_found = x1 ; then
+   if test x$net_if_found = x1 && test x$net_pfvar_found = x1 ; then
      transparent_ok=1
    fi
    if test x$linux_netfilter_ipv4 = x1 ; then

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-06-01 10:20:33 UTC (rev 10438)
+++ tor/trunk/src/or/Makefile.am	2007-06-01 10:20:37 UTC (rev 10439)
@@ -39,11 +39,11 @@
 tor_main.o: micro-revision.i
 
 micro-revision.i: FORCE
-	@if test -d ../../.svn -a x`which svn` != x ; then	\
+	@if test -d ../../.svn && test x`which svn` != x ; then	\
 	  svn info ../.. |              			\
 	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
 	     || true;                                           \
-	elif test x`which svk` != x && test -d ~/.svk; then          \
+	elif test x`which svk` != x && test -d ~/.svk/local; then \
           location=../..;                                       \
           rev=x;                                                \
           while test x$$rev = xx; do                            \
@@ -71,7 +71,7 @@
 	    echo '""' > micro-revision.i;                       \
 	  fi;                                                   \
 	elif test ! -f micro-revision.i ||                      \
-          test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \
+          test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
 	  mv micro-revision.tmp micro-revision.i;               \
 	fi