Changeset 44966 in vbox

Timestamp:

Mar 11, 2013 9:00:43 AM (12 years ago)

Author:

vboxsync

Message:

Installer/linux: fix r83769 and VBox.sh.

File:

• trunk/src/VBox/Installer/linux/VBox.sh (modified) (1 diff)

trunk/src/VBox/Installer/linux/VBox.sh

@@ -17 +17 @@
 CONFIG="/etc/vbox/vbox.cfg"
 
-if test -r "${CONFIG}"; then
+test -r "${CONFIG}" &&
     . "${CONFIG}"
-elif test -f /usr/lib/virtualbox/VirtualBox &&
-    test -x /usr/lib/virtualbox/VirtualBox; then
-    INSTALL_DIR=/usr/lib/virtualbox
-else
-    echo "Could not find VirtualBox installation. Please reinstall."
-    exit 1
-fi
+test -z "${INSTALL_DIR}" &&
+    if test -f /usr/lib/virtualbox/VirtualBox &&
+        test -x /usr/lib/virtualbox/VirtualBox; then
+        INSTALL_DIR=/usr/lib/virtualbox
+    else
+        echo "Could not find VirtualBox installation. Please reinstall."
+        exit 1
+    fi
 
 # Note: This script must not fail if the module was not successfully installed