diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2007-10-26 05:30:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2007-10-26 05:30:02 +0000 |
| commit | cc7254de33541eaa51e449f6474e6ca8402dcd75 (patch) | |
| tree | 22da8dd3d750a50f89a6963c7acb5bc1c0674845 | |
| parent | dcc7221d5460db813f1c41b5a9935879334ef173 (diff) | |
remove "echo -E" crap that I added in last commit and use printf(1) for
cases where we strictly require echo not to reprocess escape characters.
| -rw-r--r-- | regress/usr.bin/ssh/sftp-glob.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/regress/usr.bin/ssh/sftp-glob.sh b/regress/usr.bin/ssh/sftp-glob.sh index d5ebf9fd6d5..62004efc5e5 100644 --- a/regress/usr.bin/ssh/sftp-glob.sh +++ b/regress/usr.bin/ssh/sftp-glob.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-glob.sh,v 1.2 2007/10/24 03:32:35 djm Exp $ +# $OpenBSD: sftp-glob.sh,v 1.3 2007/10/26 05:30:01 djm Exp $ # Placed in the Public Domain. tid="sftp glob" @@ -9,7 +9,7 @@ sftp_ls() { expected=$3 unexpected=$4 verbose "$tid: $errtag" - $ECHOE "ls -l ${target}" | \ + printf "ls -l %s" "${target}" | \ ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \ grep -v "^sftp>" > ${RESULTS} if [ $? -ne 0 ]; then diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 9803657fabf..06aaffd5944 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,9 +1,8 @@ -# $OpenBSD: test-exec.sh,v 1.29 2007/10/24 03:32:35 djm Exp $ +# $OpenBSD: test-exec.sh,v 1.30 2007/10/26 05:30:01 djm Exp $ # Placed in the Public Domain. USER=`id -un` #SUDO=sudo -ECHOE="echo -E" if [ ! -z "$TEST_SSH_PORT" ]; then PORT="$TEST_SSH_PORT" @@ -110,32 +109,32 @@ cleanup () trace () { - $ECHOE "trace: $@" >>$TEST_SSH_LOGFILE + echo "trace: $@" >>$TEST_SSH_LOGFILE if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then - $ECHOE "$@" + echo "$@" fi } verbose () { - $ECHOE "verbose: $@" >>$TEST_SSH_LOGFILE + echo "verbose: $@" >>$TEST_SSH_LOGFILE if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then - $ECHOE "$@" + echo "$@" fi } fail () { - $ECHOE "FAIL: $@" >>$TEST_SSH_LOGFILE + echo "FAIL: $@" >>$TEST_SSH_LOGFILE RESULT=1 - $ECHOE "$@" + echo "$@" } fatal () { - $ECHOE "FATAL: $@" >>$TEST_SSH_LOGFILE - $ECHOE -n "FATAL: " + echo "FATAL: $@" >>$TEST_SSH_LOGFILE + echo -n "FATAL: " fail "$@" cleanup exit $RESULT |