X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/30fa7724572ae8a5ecbbf22012fa6fe1aea288b4..0417c34e2d641cbac292ba5cf8a619249c87d4e3:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 85030d0b..fdf51b58 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -124,6 +124,7 @@ set -e
 . "./shconfig"
 
 RUNSHFLAGS='-e'
+export RUNSHFLAGS
 
 # for Solaris
 [ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH"
@@ -144,8 +145,10 @@ if [ -f /usr/bin/whoami ]; then
     testuser=`/usr/bin/whoami`
 elif [ -f /usr/ucb/whoami ]; then
     testuser=`/usr/ucb/whoami`
+elif [ -f /bin/whoami ]; then
+    testuser=`/bin/whoami`
 else
-    testuser=`id -un || whoami || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
+    testuser=`id -un 2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
 fi
 
 echo "    testuser=$testuser"