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

Timestamp:

Mar 6, 2013 8:39:10 PM (12 years ago)

Author:

vboxsync

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

84145

Message:

S10 /bin/sh doesn't grok 'set -o' it turns out, it wants more arguments. So, just send its complaints to /dev/null for now as I'm not aware of any other way to detect that the -x option is active.

Location:

trunk/src/VBox/Installer/solaris

Files:

• pkginstall.sh (modified) (1 diff)
• postinstall.sh (modified) (1 diff)

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

@@ -35 +35 @@
     set -x
 fi
-DEBUGOPT=`set -o | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
+DEBUGOPT=`set -o 2>/dev/null | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
 
 # If PKG_INSTALL_ROOT is undefined or NULL, redefine to '/' and carry on.

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

@@ -20 +20 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    DEBUGOPT=`set -o | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
+    DEBUGOPT=`set -o 2>/dev/null | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
     ${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/pkginstall.sh --srv4 ${DEBUGOPT}
     rc=$?