Changeset 58324 in vbox

Timestamp:

Oct 20, 2015 8:39:37 AM (10 years ago)

Author:

vboxsync

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

103523

Message:

Installers/linux: cleaner script for getting shell script location folders.

Location:

trunk/src/VBox

Files:

trunk/src/VBox/Additions/linux/export_modules

-              r57316
+              r58324
+#
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_DIR="${TARGET%/[!/]*}"
 if [ -z "$1" ]; then
     echo "Usage: $0 <filename.tar.gz>"
 …
 PATH_OUT=$PATH_TMP
 FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
 PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
+PATH_ROOT="${MY_DIR}/../../../..; pwd`"
 PATH_LINUX="$PATH_ROOT/src/VBox/Additions/linux"
 PATH_VBOXGUEST="$PATH_ROOT/src/VBox/Additions/common/VBoxGuest"

-              r36759
+              r58324
 fi
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+path="${TARGET%/[!/]*}"
 # 32-bit or 64-bit?
-path=`dirname $0`
 case `uname -m` in
   i[3456789]86|x86|i86pc)

-              r57327
+              r58324
+#
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_DIR="${TARGET%/[!/]*}"
 if [ -z "$1" ]; then
     echo "Usage: $0 <filename.tar.gz> [--without-hardening]"
 …
 PATH_OUT=$PATH_TMP
 FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
 PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
+PATH_ROOT="${MY_DIR}/../../../..; pwd`"
 PATH_LINUX="$PATH_ROOT/src/VBox/HostDrivers/linux"
 PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"

-              r58264
+              r58324
+#
+MY_DIR=`dirname "$0"`
+MY_DIR=`cd "${MY_DIR}" && pwd`
+if [ ! -d "${MY_DIR}" ]; then
+    echo "Cannot find ${MY_DIR} or it's not a directory..."
+    exit 1;
+fi
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_DIR="${TARGET%/[!/]*}"
 set -e

-              r58264
+              r58324
+#
+MY_DIR=`dirname "$0"`
+MY_DIR=`cd "${MY_DIR}" && pwd`
+if [ ! -d "${MY_DIR}" ]; then
+    echo "Cannot find ${MY_DIR} or it's not a directory..."
+    exit 1;
+fi
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_DIR="${TARGET%/[!/]*}"
 if test ${#} -eq 0; then

-              r58214
+              r58324
 # (e.g. /opt/VirtualBox, /usr/lib/VirtualBox, the build output directory).
+# This is GNU-specific, sorry Solaris.  It fails on directories ending in '\n'.
+MY_PATH="$(dirname $(readlink -f -- "${0}"))"
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_PATH="${TARGET%/[!/]*}"
 cd "${MY_PATH}"
 . "./routines.sh"
 START=true
-TARGET="${MY_PATH}"
 while test -n "${1}"; do
     case "${1}" in
 …
 # Install runlevel scripts and systemd unit files
 install_init_script "${TARGET}/vboxdrv.sh" vboxdrv
 install_init_script "${TARGET}/vboxballoonctrl-service.sh" vboxballoonctrl-service
 install_init_script "${TARGET}/vboxautostart-service.sh" vboxautostart-service
 install_init_script "${TARGET}/vboxweb-service.sh" vboxweb-service
+install_init_script "${MY_PATH}/vboxdrv.sh" vboxdrv
+install_init_script "${MY_PATH}/vboxballoonctrl-service.sh" vboxballoonctrl-service
+install_init_script "${MY_PATH}/vboxautostart-service.sh" vboxautostart-service
+install_init_script "${MY_PATH}/vboxweb-service.sh" vboxweb-service
 delrunlevel vboxdrv

-              r58241
+              r58324
 # error).
+# This is GNU-specific, sorry Solaris.
+MY_PATH="$(dirname $(readlink -f -- "${0}"))/"
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_PATH="${TARGET%/[!/]*}"
 cd "${MY_PATH}"
 . "./routines.sh"

-              r58186
+              r58324
+#
+. `dirname $0`/routines.sh
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+MY_PATH="${TARGET%/[!/]*}"
+. "${MY_PATH}/routines.sh"
 if [ -z "$ro_LOG_FILE" ]; then
 …
 # Do pre-removal common to all installer types, currently service script
 # clean-up.
+`dirname $0`/prerm-common.sh || exit 1  # Arguments intentionally not quoted.
+"${MY_PATH}/prerm-common.sh" || exit 1
 # Remove kernel module installed

-              r58271
+              r58324
 MODPROBE=/sbin/modprobe
 SCRIPTNAME=vboxdrv
+# This is GNU-specific, sorry Solaris.  It fails on directories ending in '\n'.
+SCRIPT_DIR="$(dirname $(readlink -f -- "${0}"))"
+# The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
+TARGET=`readlink -e -- "${0}"` || exit 1
+SCRIPT_DIR="${TARGET%/[!/]*}"
 if $MODPROBE -c | grep -q '^allow_unsupported_modules  *0'; then

Note: See TracChangeset for help on using the changeset viewer.