about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xConfig/installfns.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c57eed5a7..eb0a05328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-24  Clint Adams  <clint@zsh.org>
+
+	* 21510: Config/installfns.sh: use && rather than -a binary
+	test operator.
+
 2005-07-23  Clint Adams  <clint@zsh.org>
 
 	* 21505, 21506: Completion/Unix/Command/_rubber: use an array for
diff --git a/Config/installfns.sh b/Config/installfns.sh
index 83f3cb6c1..d680b4b28 100755
--- a/Config/installfns.sh
+++ b/Config/installfns.sh
@@ -17,7 +17,7 @@ for file in $allfuncs; do
     case "$file" in
       */CVS/*) continue;;
     esac
-    if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
+    if test x$FUNCTIONS_SUBDIRS != x && test x$FUNCTIONS_SUBDIRS != xno; then
       case "$file" in
       Completion/*/*)
         subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"