- (tim) [regress/sftp-cmds.sh regress/ssh2putty.sh] Shell portability fixes

   from imorgan at nas.nasa.gov

diff --git a/ChangeLog b/ChangeLog
index c45329cf965f0ce0aa46e59b288352e1cb58d89b..37391cc5d5efbde5ba147b7f92c9a0e27f7420f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    puttygen(1) by $PATH
  - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
    by vinschen at redhat.com.
+ - (tim) [regress/sftp-cmds.sh regress/ssh2putty.sh] Shell portability fixes
+   from imorgan at nas.nasa.gov
 
 20080312
  - (djm) OpenBSD CVS Sync

diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index a9bf504726682122633b3ea3fa42b684b713250c..3cd7e6b4bdb87a926d8a5dc5450c7a69c73727a8 100644 (file)
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -44,12 +44,12 @@ rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
 mkdir ${COPY}.dd
 
 verbose "$tid: lls"
-echo "cd ${OBJ}\nlls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \
-       grep -q copy.dd || fail "lls failed"
+echo "cd ${OBJ}" ; echo "lls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \
+       grep copy.dd >/dev/null 2>&1 || fail "lls failed"
 
 verbose "$tid: lls w/path"
 echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \
-       grep -q copy.dd || fail "lls w/path failed"
+       grep copy.dd >/dev/null 2>&1 || fail "lls w/path failed"
 
 verbose "$tid: ls"
 echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \

diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index 82dd4478739d5acb7ce1631872521fd0aa4f69d0..dfdeeff4a0baf1bebf09928bdb15cd560a473cbf 100755 (executable)
--- a/regress/ssh2putty.sh
+++ b/regress/ssh2putty.sh
@@ -10,7 +10,9 @@ PORT=$2
 KEYFILE=$3
 
 # XXX - support DSA keys too
-if ! grep -q "BEGIN RSA PRIVATE KEY" $KEYFILE ; then
+if grep "BEGIN RSA PRIVATE KEY" $KEYFILE >/dev/null 2>&1 ; then
+       :
+else
        echo "Unsupported private key format"
        exit 1
 fi