From 53c55f41798a7c386251f6922046b8d1f551a8f9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 4 Sep 2003 15:16:56 +1000 Subject: - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh regress/test-exec.sh] Handle different was of echoing without newlines. --- regress/test-exec.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'regress/test-exec.sh') diff --git a/regress/test-exec.sh b/regress/test-exec.sh index a7a8ddbe6..35f555b27 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -72,6 +72,17 @@ export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER # helper +echon() +{ + if [ "x`echo -n`" = "x" ]; then + echo -n "$@" + elif [ "x`echo '\c'`" = "x" ]; then + echo "$@\c" + else + fatal "Don't know how to echo without newline." + fi +} + cleanup () { if [ -f $PIDFILE ]; then @@ -111,7 +122,7 @@ fail () fatal () { - echo -n "FATAL: " + echon "FATAL: " fail "$@" cleanup exit $RESULT @@ -169,7 +180,7 @@ for t in rsa rsa1; do # known hosts file for client ( - echo -n 'localhost-with-alias,127.0.0.1,::1 ' + echon 'localhost-with-alias,127.0.0.1,::1 ' cat $OBJ/$t.pub ) >> $OBJ/known_hosts -- cgit v1.2.3