diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2008-06-10 15:21:42 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2008-06-10 15:21:42 +0000 |
| commit | 81e4f072710d46b98ff17d73007f225094b6d9ae (patch) | |
| tree | a71e5281d71e54332ea36075a8d8cf62219a287a /regress/usr.bin/ssh/test-exec.sh | |
| parent | 1f4b7f3d2ba2702e1ab0c881e6771e2931fb9cb8 (diff) | |
Use a more portable construct for checking if we're running a putty test
Diffstat (limited to 'regress/usr.bin/ssh/test-exec.sh')
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 45e744679cc..f835c1ad9c1 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/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. USER=`id -un` @@ -235,7 +235,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 |