X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3e7934a5fb06dac717722c4d680d0c063dbf8d5f..13d00101e808ebfc327f8c5e830b96303facf31f:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 85030d0b..c4c4137f 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -144,8 +144,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"