installCDE: don't hardcode path to whoami

[oweals/cde.git] / cde / admin / IntegTools / dbTools / installCDE.src

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index a00fefd13aa5f1134b72b50f8f172c8c202ab5b1..233b4a96549dd008d13fff50cce6e0bc480c7a4c 100755 (executable)
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
 
 Log()
 {
-  /bin/echo "$1" | tee -a $LOGFILE
+  echo "$1" | tee -a $LOGFILE
 }
 
 MakeTarball()
@@ -537,14 +537,7 @@ XCOMM
     PLATFORM_SCRIPT_DIR=hp
   fi
 
-  if [ "$PLATFORM" = "aix" ];
-  then
-    USER=$(/bin/whoami)
-  else
-    USER=$(/usr/bin/whoami)
-  fi
-
-  if [ "$USER" != "root" ];
+  if [ $(whoami) != "root" ];
   then
     echo ""
     echo "You should be root to run this script.  Continuing anyway."