- dtucker@cvs.openbsd.org 2008/06/10 15:21:41

     [test-exec.sh]
     Use a more portable construct for checking if we're running a putty test

2 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c323428a3..f674a79a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
    - dtucker@cvs.openbsd.org 2008/06/10 05:23:32
      [regress/addrmatch.sh regress/Makefile]
      Regress test for Match CIDR rules.  ok djm@
+   - dtucker@cvs.openbsd.org 2008/06/10 15:21:41
+     [test-exec.sh]
+     Use a more portable construct for checking if we're running a putty test
   - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
     since the new CIDR code in addmatch.c references it.
 
@@ -4120,4 +4123,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4956 2008/06/10 13:52:51 dtucker Exp $
+$Id: ChangeLog,v 1.4957 2008/06/10 15:38:52 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 89470682b..f05c671cd 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.32 2008/06/09 18:06:32 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.33 2008/06/10 15:21:41 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -290,7 +290,15 @@ chmod 644 $OBJ/authorized_keys_$USER
 # If PuTTY is present and we are running a PuTTY test, prepare keys and
 # configuration
 REGRESS_INTEROP_PUTTY=no
-if test -x $PUTTYGEN -a -x $PLINK && [[ $SCRIPT = *putty* ]] ; then
+if test -x $PUTTYGEN -a -x $PLINK ; then
+        REGRESS_INTEROP_PUTTY=yes
+fi
+case "$SCRIPT" in
+*putty*)        ;;
+*)              REGRESS_INTEROP_PUTTY=no ;;
+esac
+
+if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
         mkdir -p ${OBJ}/.putty
 
         # Add a PuTTY key to authorized_keys