Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates-src > by-pkgid > 9c90fbc038ca28f1c22e1c232e9b8a44 > files > 14

virtualbox-5.1.2-1.mga5.src.rpm

diff -Nurp VirtualBox-5.1.0.p22/src/VBox/Installer/linux/VBox.sh VirtualBox-5.1.0.p23/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-5.1.0.p22/src/VBox/Installer/linux/VBox.sh	2016-07-12 17:54:27.000000000 +0300
+++ VirtualBox-5.1.0.p23/src/VBox/Installer/linux/VBox.sh	2016-07-14 01:48:00.190882001 +0300
@@ -16,40 +16,18 @@
 #
 
 PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
 
-# The below is GNU-specific.  See slightly further down for a version which
-# works on Solaris and OS X.
-TARGET=`readlink -e -- "${0}"` || exit 1
-MY_DIR="${TARGET%/[!/]*}"
-
-# (
-#     path="${0}"
-#     while test -n "${path}"; do
-#         # Make sure we have at least one slash and no leading dash.
-#         expr "${path}" : / > /dev/null || path="./${path}"
-#         # Filter out bad characters in the path name.
-#         expr "${path}" : ".*[*?<>\\]" > /dev/null && exit 1
-#         # Catch embedded new-lines and non-existing (or path-relative) files.
-#         # $0 should always be absolute when scripts are invoked through "#!".
-#         test "`ls -l -d "${path}" 2> /dev/null | wc -l`" -eq 1 || exit 1
-#         # Change to the folder containing the file to resolve relative links.
-#         folder=`expr "${path}" : "\(.*/\)[^/][^/]*/*$"` || exit 1
-#         path=`expr "x\`ls -l -d "${path}"\`" : "[^>]* -> \(.*\)"`
-#         cd "${folder}"
-#         # If the last path was not a link then we are in the target folder.
-#         test -n "${path}" || pwd
-#     done
-# )
-
-if test -f /usr/lib/virtualbox/VirtualBox &&
-    test -x /usr/lib/virtualbox/VirtualBox; then
-    INSTALL_DIR=/usr/lib/virtualbox
-elif test -f "${MY_DIR}/VirtualBox" && test -x "${MY_DIR}/VirtualBox"; then
-    INSTALL_DIR="${MY_DIR}"
-else
-    echo "Could not find VirtualBox installation. Please reinstall."
-    exit 1
-fi
+test -r "${CONFIG}" &&
+    . "${CONFIG}"
+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
 #       because the user might not want to run a VM but only change VM params!