'||', '&&' and 'test -x' apparently don't work on Ultrix;

also 'test' appears to be available as '[' only in 'if' conditions.

diff --git a/CHANGES b/CHANGES
index 32d49f3f5e3779ab8fa2c97ebf6079a9a71ef662..90b0dd12553236f4b64eaca8a4b5c8be6bd6186e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Change bctest again: '-x' expressions are not available in all
+     versions of 'test'.
+     [Bodo Moeller]
+
   *) Fix a couple of memory leaks in PKCS7_dataDecode()
      [Steve Henson, reported by Heyun Zheng <hzheng@atdsprint.com>]
 

diff --git a/Makefile.org b/Makefile.org
index 5a410881952a3173792130341059df78c10b7e9b..6fbf6b5825f8dd159c22d819040a86ecfc8dd712 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -538,7 +538,7 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man7
        @for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
-               sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
@@ -547,7 +547,7 @@ install_docs:
        done
        @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
-               sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \

diff --git a/test/bctest b/test/bctest
index 17b75d4ecabdbb547ead3376992f7651d091d929..7dde7816531186cb3638d7472d352bac1deb8879 100755 (executable)
--- a/test/bctest
+++ b/test/bctest
@@ -12,10 +12,22 @@
 
 
 IFS=:
-for dir in $PATH; do
-    bc="$dir/bc"
+try_path=true
+# First we try "bc", then "$dir/bc" for each item in $PATH.
+for dir in dummy:$PATH; do
+    if [ "$try_path" = true ]; then
+      # first iteration
+      bc=bc
+      try_path=false
+    else
+      # second and later iterations
+      bc="$dir/bc"
+      if [ ! -f "$bc" ]; then  # '-x' is not available on Ultrix
+        bc=''
+      fi
+    fi
 
-    if [ -x "$bc" -a ! -d "$bc" ]; then
+    if [ ! "$bc" = '' ]; then
         failure=none