X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Faux-fixed%2Fshowenv;h=69c8ee006b44fa46dfa736edb995eaa388924910;hb=305e4faec28e5e0eb990009f720aef91c1ecba92;hp=5d9ef8f8a34e05ea47fb6b643cd31a8e83c197ea;hpb=b9c5223b77400cec8c44a8972a238f9cde82f0fc;p=exim.git

diff --git a/test/aux-fixed/showenv b/test/aux-fixed/showenv
index 5d9ef8f8a..69c8ee006 100755
--- a/test/aux-fixed/showenv
+++ b/test/aux-fixed/showenv
@@ -3,7 +3,9 @@
 # This script outputs certain information about the environment, for use when
 # testing pipe transports.
 
-name=`whoami 2>/dev/null` || name=`who . . | awk '{print $1}'`
+cmd=/usr/xpg4/bin/id
+[ -x $cmd ] || cmd=id
+name=`$cmd -un`
 
 echo Test pipe script
 echo Running as: $name
@@ -14,7 +16,8 @@ while [ "$1" != "" ]; do
   shift
 done
 echo ----------current-----------
-pwd
+# strip trailing / from pwd result
+d=`pwd`/dummy; dirname $d
 echo ----------env-----------
 echo A=$A
 echo B=$B