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

Timestamp:

Jun 19, 2015 3:17:45 PM (10 years ago)

Author:

vboxsync

Message:

Solaris/Installer: Fix for Solaris 12 renaming iconv/utf-8 package.

File:

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

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

@@ -51 +51 @@
 {
     if test -z "$1"; then
-        errorprint "Missing argument to checkdep_svr4"
+        errorprint "Missing argument to checkdep_ips"
         return 1
     fi
@@ -61 +61 @@
     PKG_MISSING_IPS="$PKG_MISSING_IPS $1"
     return 1
-
+}
+
+checkdep_ips_either()
+{
+    if test -z "$1" || test -z "$2"; then
+        errorprint "Missing argument to checkdep_ips_either"
+        return 1
+    fi
+    # using "list" without "-a" only lists installed pkgs which is what we need
+    $BIN_PKG $BASEDIR_OPT list "$1" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    $BIN_PKG $BASEDIR_OPT list "$2" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    PKG_MISSING_IPS="$PKG_MISSING_IPS $1 or $2"
+    return 1
 }
 
@@ -117 +135 @@
 if test -x "$BIN_PKG"; then
     checkdep_ips "runtime/python-26"
-    checkdep_ips "system/library/iconv/utf-8"
+    checkdep_ips_either "system/library/iconv/utf-8" "system/library/iconv/iconv-core"
 else
     PKG_MISSING_IPS="runtime/python-26 system/library/iconv/utf-8"