Changeset 50787 in vbox for trunk/src/VBox

Timestamp:

Mar 14, 2014 1:15:26 PM (11 years ago)

Author:

vboxsync

Message:

Installer/solaris: Use pgrep, it's been there since Solaris 8.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (4 diffs)

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -47 +47 @@
 BIN_ID=/usr/bin/id
 BIN_PKILL=/usr/bin/pkill
+BIN_PGREP=/usr/bin/pgrep
 
 # "vboxdrv" is also used in sed lines here (change those as well if it ever changes)
@@ -203 +204 @@
     if test ! -x "$BIN_PKILL"; then
         BIN_PKILL=`find_bin_path "$BIN_PKILL"`
+    fi
+
+    if test ! -x "$BIN_PGREP"; then
+        BIN_PGREP=`find_bin_path "$BIN_PGREP"`
     fi
 }
@@ -837 +842 @@
     fi
 
-    procname=$1
-    procpid=`ps -eo pid,fname | grep $procname | grep -v grep | awk '{ print $1 }'`
-    if test ! -z "$procpid" && test "$procpid" -ge 0; then
+    procname="$1"
+    $BIN_PGREP "$procname" > /dev/null 2>&1
+    if test "$?" -eq 0; then
         return 1
     fi
@@ -855 +860 @@
     fi
 
-    # @todo use is_process_running()
-    procname=$1
-    procpid=`ps -eo pid,fname | grep $procname | grep -v grep | awk '{ print $1 }'`
-    if test ! -z "$procpid" && test "$procpid" -ge 0; then
+    procname="$1"
+    is_process_running "$procname"
+    if test "$?" -eq 1; then
         $BIN_PKILL "$procname"
         sleep 2
-        procpid=`ps -eo pid,fname | grep $procname | grep -v grep | awk '{ print $1 }'`
-        if test ! -z "$procpid" && test "$procpid" -ge 0; then
+        is_process_running "$procname"
+        if test "$?" -eq 1; then
             subprint "Terminating: $procname  ...FAILED!"
             if test "$fatal" = "$FATALOP"; then