Changeset 58696 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 16, 2015 10:41:05 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104123

Message:

Solaris/Installer: avoid calling 'which' on checkinstall if possible.

File:

• trunk/src/VBox/Installer/solaris/checkinstall.sh (modified) (2 diffs)

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

@@ -97 +97 @@
 }
 
+# find_bin_path()
+# !! failure is always fatal
+find_bin_path()
+{
+    if test -z "$1"; then
+        errorprint "missing argument to find_bin_path()"
+        exit 1
+    fi
+
+    binfilename=`basename $1`
+    binfilepath=`which $binfilename 2> /dev/null`
+    if test -x "$binfilepath"; then
+        echo "$binfilepath"
+        return 0
+    else
+        errorprint "$1 missing or is not an executable"
+        exit 1
+    fi
+}
+
+# find_bins()
+# !! failure is always fatal
+find_mandatory_bins()
+{
+    # Search only for binaries that might be in different locations
+    if test ! -x "$BIN_SVCS"; then
+        BIN_SVCS=`find_bin_path "$BIN_SVCS"`
+    fi
+
+    if test ! -x "$BIN_SVCADM"; then
+        BIN_SVCADM=`find_bin_path "$BIN_SVCADM"`
+    fi
+}
+
+
 #
 # Begin execution
@@ -116 +151 @@
 PKG_MISSING_IPS=""
 PKG_MISSING_SVR4=""
-BIN_PKGINFO=`which pkginfo 2> /dev/null`
-BIN_PKG=`which pkg 2> /dev/null`
-BIN_SVCS=`which svcs 2> /dev/null`
+BIN_PKGINFO=/usr/bin/pkginfo
+BIN_PKG=/usr/bin/pkg
+BIN_SVCS=/usr/bin/svcs
 BIN_SVCADM=/usr/sbin/svcadm
 
-# Check if our binaries are fine
-if test ! -x "$BIN_SVCS"; then
-    errorprint "Missing or non-executable binary: svcs ($BIN_SVCS)."
-    exit 1
-fi
-if test ! -x "$BIN_SVCADM"; then
-    errorprint "Missing or non-executable binary: svcadm ($BIN_SVCADM)."
-    exit 1
-fi
+# Check non-optional binaries
+find_mandatory_bins
 
 infoprint "Checking package dependencies..."