Changeset 8320 in vbox

Timestamp:

Apr 23, 2008 9:51:38 AM (17 years ago)

Author:

vboxsync

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

30082

Message:

Solaris host,guest installer: Removed some unnecessary checks.

Location:

trunk/src/VBox

Files:

• Additions/solaris/Installer/makepackage.sh (modified) (3 diffs)
• Installer/solaris/makepackage.sh (modified) (3 diffs)

trunk/src/VBox/Additions/solaris/Installer/makepackage.sh

@@ -1 +1 @@
 #!/bin/sh
-set -e
 # Sun xVM VirtualBox
 # VirtualBox Solaris Guest Additions package creation script.
@@ -38 +37 @@
 fi
 
+# bail out on non-zero exit status
+set -e
+
 # prepare file list
 cd "$1"
@@ -65 +67 @@
 # create the package instance
 pkgmk -p $VBOXPKG_TIMESTAMP -o -r .
-if test $? -ne 0; then
-    exit 1
-fi
 
 # translate into package datastream
 pkgtrans -s -o /var/spool/pkg `pwd`/$2 "$MY_PKGNAME"
-if test $? -ne 0; then
-    exit 1
-fi
 
 rm -rf "/var/spool/pkg/$MY_PKGNAME"

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

@@ -1 +1 @@
 #!/bin/sh
-set -e
 # Sun xVM VirtualBox
 # VirtualBox Solaris package creation script.
@@ -49 +48 @@
 fi
 
+# bail out on non-zero exit status
+set -e
 
 # prepare file list
@@ -79 +80 @@
 # create the package instance
 pkgmk -p $VBOXPKG_TIMESTAMP -o -r .
-if test $? -ne 0; then
-    exit 1
-fi
 
 # translate into package datastream
 pkgtrans -s -o /var/spool/pkg "`pwd`/$VBOX_PKGFILE" "$VBOX_PKGNAME"
-if test $? -ne 0; then
-    exit 1
-fi
 
 $VBOX_GTAR zcvf "$VBOX_ARCHIVE" "$VBOX_PKGFILE" autoresponse ReadMe.txt
 
-if test  $? -eq 0; then
-    echo "## Packaging and transfer completed successfully!"
-fi
+echo "## Packaging and transfer completed successfully!"
 rm -rf "/var/spool/pkg/$VBOX_PKGNAME"
+
 exit $?