Merge branch '4.next'

[exim.git] / test / aux-fixed / showenv

diff --git a/test/aux-fixed/showenv b/test/aux-fixed/showenv
index fc377cc8b9af77d13b5e8c5714d825f2cd7bc238..69c8ee006b44fa46dfa736edb995eaa388924910 100755 (executable)
--- 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=`id -un`
+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