Changeset 76610 in vbox for trunk

Timestamp:

Jan 2, 2019 1:27:51 PM (6 years ago)

Author:

vboxsync

Message:

Linux installer: Various path quoting fixes / simplifications.

Location:

trunk/src/VBox/Installer/linux

Files:

• check_module_dependencies.sh (modified) (3 diffs)
• install.sh (modified) (12 diffs)
• postinst-common.sh (modified) (4 diffs)
• uninstall.sh (modified) (3 diffs)

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

@@ -74 +74 @@
 UNIT_TEST=
 
-case "${1}" in
+case "$1" in
 "")
     # Return immediately successfully if everything is installed
     type ${TOOLS} >/dev/null 2>&1 && HAVE_TOOLS=yes
     test -d "/lib/modules/`uname -r`/build/include" && HAVE_HEADERS=yes
-    test -n "${HAVE_TOOLS}" && test -n "${HAVE_HEADERS}" && exit 0
+    test -n "$HAVE_TOOLS" && test -n "$HAVE_HEADERS" && exit 0
     UNAME=`uname -r`
     for i in rpm dpkg; do
         for j in /var/lib/${i}/*; do
             test -e "${j}" || break
-            if test -z "${PACKAGE_TYPE}"; then
+            if test -z "$PACKAGE_TYPE"; then
                 PACKAGE_TYPE="${i}"
             else
@@ -94 +94 @@
     ;;
 -h|--help)
-    echo "${USAGE_MESSAGE}"
+    echo "$USAGE_MESSAGE"
     exit 0 ;;
 *)
     ERROR=""
-    UNAME="${2}"
-    PACKAGE_TYPE="${3}"
-    BASE_EXPECTED="${4}"
-    VERSIONED_EXPECTED="${5}"
+    UNAME="$2"
+    PACKAGE_TYPE="$3"
+    BASE_EXPECTED="$4"
+    VERSIONED_EXPECTED="$5"
     test "${1}" = --test || ERROR=yes
-    test -n "${UNAME}" && test -n "${PACKAGE_TYPE}" || test -z "${UNAME}" ||
+    test -n "$UNAME" && test -n "${PACKAGE_TYPE}" || test -z "$UNAME" ||
         ERROR=yes
-    test -n "${BASE_EXPECTED}" && test -n "${VERSIONED_EXPECTED}" ||
-        test -z "${BASE_EXPECTED}" || ERROR=yes
-    case "${ERROR}" in ?*)
-        echo "${USAGE_MESSAGE}" >&2
+    test -n "$BASE_EXPECTED" && test -n "$VERSIONED_EXPECTED" ||
+        test -z "$BASE_EXPECTED" || ERROR=yes
+    case "$ERROR" in ?*)
+        echo "$USAGE_MESSAGE" >&2
         exit 1
     esac
     TEST=yes
     TEST_PARAMS="${2} ${3} ${4} ${5}"
-    test -z "${UNAME}" && UNIT_TEST=yes
+    test -z "$UNAME" && UNIT_TEST=yes
     ;;
 esac
 
-case "${PACKAGE_TYPE}" in
+case "$PACKAGE_TYPE" in
 rpm)
     for i in ${SUSE_FLAVOURS}; do
-        case "${UNAME}" in *-"${i}")
+        case "$UNAME" in *-"${i}")
             BASE_PACKAGE="kernel-${i}-devel"
-            VERSIONED_PACKAGE="kernel-${i}-devel-${UNAME%-${i}}"
+            VERSIONED_PACKAGE="kernel-${i}-devel-$UNAME%-${i}"
             break
         esac
     done
     for i in ${EL_FLAVOURS} ""; do
-        case "${UNAME}" in *.el5"${i}"|*.el*"${i}".i686|*.el*"${i}".x86_64)
+        case "$UNAME" in *.el5"${i}"|*.el*"${i}".i686|*.el*"${i}".x86_64)
             test -n "${i}" && i="${i}-"  # Hack to handle empty flavour.
             BASE_PACKAGE="kernel-${i}devel"
-            VERSIONED_PACKAGE="kernel-${i}devel-${UNAME}"
-            break
-        esac
-    done
-    case "${UNAME}" in *.fc*.i686|*.fc*.x86_64)  # Fedora
+            VERSIONED_PACKAGE="kernel-${i}devel-$UNAME"
+            break
+        esac
+    done
+    case "$UNAME" in *.fc*.i686|*.fc*.x86_64)  # Fedora
         BASE_PACKAGE="kernel-devel"
-        VERSIONED_PACKAGE="kernel-devel-${UNAME}"
+        VERSIONED_PACKAGE="kernel-devel-$UNAME"
     esac
     for i in ${MAGEIA_FLAVOURS} ""; do  # Mageia
-        case "${UNAME}" in *-"${i}"*.mga*)
+        case "$UNAME" in *-"${i}"*.mga*)
             if test -z "${i}"; then
                 BASE_PACKAGE="kernel-linus-devel"
-                VERSIONED_PACKAGE="kernel-linus-devel-${UNAME}"
+                VERSIONED_PACKAGE="kernel-linus-devel-$UNAME"
             else
                 BASE_PACKAGE="kernel-${i}-devel"
-                VERSIONED_PACKAGE="kernel-${i}-devel-${UNAME%-${i}*}${UNAME#*${i}}"
+                VERSIONED_PACKAGE="kernel-${i}-devel-$UNAME%-${i}*$UNAME#*${i}"
             fi
             break
@@ -153 +153 @@
 dpkg)
     for i in ${DEBIAN_FLAVOURS}; do  # Debian/Ubuntu
-        case "${UNAME}" in *-${i})
+        case "$UNAME" in *-${i})
             BASE_PACKAGE="linux-headers-${i}"
-            VERSIONED_PACKAGE="linux-headers-${UNAME}"
-            break
-        esac
-    done
-    case "${UNAME}" in *-pclos*)  # PCLinuxOS
+            VERSIONED_PACKAGE="linux-headers-$UNAME"
+            break
+        esac
+    done
+    case "$UNAME" in *-pclos*)  # PCLinuxOS
         BASE_PACKAGE="kernel-devel"
-        VERSIONED_PACKAGE="kernel-devel-${UNAME}"
-    esac
-esac
-
-case "${UNIT_TEST}${BASE_EXPECTED}" in "")
+        VERSIONED_PACKAGE="kernel-devel-$UNAME"
+    esac
+esac
+
+case "$UNIT_TEST$BASE_EXPECTED" in "")
     echo "This system is currently not set up to build kernel modules." >&2
-    test -n "${HAVE_TOOLS}" ||
-        echo "Please install the ${TOOLS} packages from your distribution." >&2
-    test -n "${HAVE_HEADERS}" && exit 1
+    test -n "$HAVE_TOOLS" ||
+        echo "Please install the $TOOLS packages from your distribution." >&2
+    test -n "$HAVE_HEADERS" && exit 1
     echo "Please install the Linux kernel \"header\" files matching the current kernel" >&2
     echo "for adding new hardware support to the system." >&2
-    if test -n "${BASE_PACKAGE}${VERSIONED_PACKAGE}"; then
+    if test -n "$BASE_PACKAGE$VERSIONED_PACKAGE"; then
         echo "The distribution packages containing the headers are probably:" >&2
-        echo "    ${BASE_PACKAGE} ${VERSIONED_PACKAGE}" >&2
+        echo "    $BASE_PACKAGE $VERSIONED_PACKAGE" >&2
     fi
-    test -z "${TEST}" && exit 1
+    test -z "$TEST" && exit 1
     exit 0
 esac
 
-case "${BASE_EXPECTED}" in ?*)
-    case "${BASE_EXPECTED} ${VERSIONED_EXPECTED}" in
-        "${BASE_PACKAGE} ${VERSIONED_PACKAGE}")
+case "$BASE_EXPECTED" in ?*)
+    case "$BASE_EXPECTED $VERSIONED_EXPECTED" in
+        "$BASE_PACKAGE $VERSIONED_PACKAGE")
         exit 0
     esac
-    echo "Test: ${TEST_PARAMS}" >&2
-    echo "Result: ${BASE_PACKAGE} ${VERSIONED_PACKAGE}"
+    echo "Test: $TEST_PARAMS" >&2
+    echo "Result: $BASE_PACKAGE $VERSIONED_PACKAGE"
     exit 1
 esac

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

@@ -202 +202 @@
     # Find previous installation
     if test -r "$CONFIG_DIR/$CONFIG"; then
-        . $CONFIG_DIR/$CONFIG
+        . ${CONFIG_DIR}/$CONFIG
         PREV_INSTALLATION=$INSTALL_DIR
     fi
@@ -228 +228 @@
 
     # Remove previous installation
-    test "${BUILD_MODULE}" = true || VBOX_DONT_REMOVE_OLD_MODULES=1
+    test "$BUILD_MODULE" = true || VBOX_DONT_REMOVE_OLD_MODULES=1
 
     if [ -n "$PREV_INSTALLATION" ]; then
@@ -241 +241 @@
     fi
 
-    mkdir -p -m 755 $CONFIG_DIR
-    touch $CONFIG_DIR/$CONFIG
+    mkdir -p -m 755 ${CONFIG_DIR}
+    touch ${CONFIG_DIR}/$CONFIG
 
     info "Installing VirtualBox to $INSTALLATION_DIR"
@@ -249 +249 @@
 
     # Verify the archive
-    mkdir -p -m 755 $INSTALLATION_DIR
+    mkdir -p -m 755 ${INSTALLATION_DIR}
     bzip2 -d -c VirtualBox.tar.bz2 > VirtualBox.tar
-    if ! tar -tf VirtualBox.tar > $CONFIG_DIR/$CONFIG_FILES; then
-        rmdir $INSTALLATION_DIR 2> /dev/null
-        rm -f $CONFIG_DIR/$CONFIG 2> /dev/null
-        rm -f $CONFIG_DIR/$CONFIG_FILES 2> /dev/null
+    if ! tar -tf VirtualBox.tar > ${CONFIG_DIR}/$CONFIG_FILES; then
+        rmdir ${INSTALLATION_DIR} 2> /dev/null
+        rm -f ${CONFIG_DIR}/$CONFIG 2> /dev/null
+        rm -f ${CONFIG_DIR}/$CONFIG_FILES 2> /dev/null
         log 'Error running "bzip2 -d -c VirtualBox.tar.bz2" or "tar -tf VirtualBox.tar".'
         abort "Error installing VirtualBox.  Installation aborted"
@@ -260 +260 @@
 
     # Create installation directory and install
-    if ! tar -xf VirtualBox.tar -C $INSTALLATION_DIR; then
+    if ! tar -xf VirtualBox.tar -C ${INSTALLATION_DIR}; then
         cwd=`pwd`
-        cd $INSTALLATION_DIR
-        rm -f `cat $CONFIG_DIR/$CONFIG_FILES` 2> /dev/null
+        cd ${INSTALLATION_DIR}
+        rm -f `cat ${CONFIG_DIR}/$CONFIG_FILES` 2> /dev/null
         cd $pwd
-        rmdir $INSTALLATION_DIR 2> /dev/null
-        rm -f $CONFIG_DIR/$CONFIG 2> /dev/null
+        rmdir ${INSTALLATION_DIR} 2> /dev/null
+        rm -f ${CONFIG_DIR}/$CONFIG 2> /dev/null
         log 'Error running "tar -xf VirtualBox.tar -C '"$INSTALLATION_DIR"'".'
         abort "Error installing VirtualBox.  Installation aborted"
     fi
 
-    cp uninstall.sh $INSTALLATION_DIR
-    echo "uninstall.sh" >> $CONFIG_DIR/$CONFIG_FILES
+    cp uninstall.sh ${INSTALLATION_DIR}
+    echo "uninstall.sh" >> ${CONFIG_DIR}/$CONFIG_FILES
 
     # Hardened build: Mark selected binaries set-user-ID-on-execution,
@@ -278 +278 @@
     #                 and finally make sure the directory is only writable by the user (paranoid).
     if [ -n "$HARDENED" ]; then
-        if [ -f $INSTALLATION_DIR/VirtualBoxVM ]; then
-            test -e $INSTALLATION_DIR/VirtualBoxVM   && chmod 4511 $INSTALLATION_DIR/VirtualBoxVM
+        if [ -f "$INSTALLATION_DIR/VirtualBoxVM" ]; then
+            test -e ${INSTALLATION_DIR}/VirtualBoxVM   && chmod 4511 ${INSTALLATION_DIR}/VirtualBoxVM
         else
-            test -e $INSTALLATION_DIR/VirtualBox     && chmod 4511 $INSTALLATION_DIR/VirtualBox
+            test -e ${INSTALLATION_DIR}/VirtualBox     && chmod 4511 ${INSTALLATION_DIR}/VirtualBox
         fi
-        test -e $INSTALLATION_DIR/VBoxSDL        && chmod 4511 $INSTALLATION_DIR/VBoxSDL
-        test -e $INSTALLATION_DIR/VBoxHeadless   && chmod 4511 $INSTALLATION_DIR/VBoxHeadless
-        test -e $INSTALLATION_DIR/VBoxNetDHCP    && chmod 4511 $INSTALLATION_DIR/VBoxNetDHCP
-        test -e $INSTALLATION_DIR/VBoxNetNAT     && chmod 4511 $INSTALLATION_DIR/VBoxNetNAT
-
-        ln -sf $INSTALLATION_DIR/VBoxVMM.so   $INSTALLATION_DIR/components/VBoxVMM.so
-        ln -sf $INSTALLATION_DIR/VBoxRT.so    $INSTALLATION_DIR/components/VBoxRT.so
-
-        chmod go-w $INSTALLATION_DIR
+        test -e ${INSTALLATION_DIR}/VBoxSDL        && chmod 4511 ${INSTALLATION_DIR}/VBoxSDL
+        test -e ${INSTALLATION_DIR}/VBoxHeadless   && chmod 4511 ${INSTALLATION_DIR}/VBoxHeadless
+        test -e ${INSTALLATION_DIR}/VBoxNetDHCP    && chmod 4511 ${INSTALLATION_DIR}/VBoxNetDHCP
+        test -e ${INSTALLATION_DIR}/VBoxNetNAT     && chmod 4511 ${INSTALLATION_DIR}/VBoxNetNAT
+
+        ln -sf ${INSTALLATION_DIR}/VBoxVMM.so   ${INSTALLATION_DIR}/components/VBoxVMM.so
+        ln -sf ${INSTALLATION_DIR}/VBoxRT.so    ${INSTALLATION_DIR}/components/VBoxRT.so
+
+        chmod go-w ${INSTALLATION_DIR}
     fi
 
     # This binaries need to be suid root in any case, even if not hardened
-    test -e $INSTALLATION_DIR/VBoxNetAdpCtl && chmod 4511 $INSTALLATION_DIR/VBoxNetAdpCtl
-    test -e $INSTALLATION_DIR/VBoxVolInfo && chmod 4511 $INSTALLATION_DIR/VBoxVolInfo
+    test -e ${INSTALLATION_DIR}/VBoxNetAdpCtl && chmod 4511 ${INSTALLATION_DIR}/VBoxNetAdpCtl
+    test -e ${INSTALLATION_DIR}/VBoxVolInfo && chmod 4511 ${INSTALLATION_DIR}/VBoxVolInfo
 
     # Write the configuration.  Needs to be done before the vboxdrv service is
     # started.
-    echo "# VirtualBox installation directory" > $CONFIG_DIR/$CONFIG
-    echo "INSTALL_DIR='$INSTALLATION_DIR'" >> $CONFIG_DIR/$CONFIG
-    echo "# VirtualBox version" >> $CONFIG_DIR/$CONFIG
-    echo "INSTALL_VER='$VERSION'" >> $CONFIG_DIR/$CONFIG
-    echo "INSTALL_REV='$SVNREV'" >> $CONFIG_DIR/$CONFIG
-    echo "# Build type and user name for logging purposes" >> $CONFIG_DIR/$CONFIG
-    echo "BUILD_TYPE='$BUILD_BUILDTYPE'" >> $CONFIG_DIR/$CONFIG
-    echo "USERNAME='$BUILD_USERNAME'" >> $CONFIG_DIR/$CONFIG
+    echo "# VirtualBox installation directory" > ${CONFIG_DIR}/$CONFIG
+    echo "INSTALL_DIR='${INSTALLATION_DIR}'" >> ${CONFIG_DIR}/$CONFIG
+    echo "# VirtualBox version" >> ${CONFIG_DIR}/$CONFIG
+    echo "INSTALL_VER='$VERSION'" >> ${CONFIG_DIR}/$CONFIG
+    echo "INSTALL_REV='$SVNREV'" >> ${CONFIG_DIR}/$CONFIG
+    echo "# Build type and user name for logging purposes" >> ${CONFIG_DIR}/$CONFIG
+    echo "BUILD_TYPE='$BUILD_BUILDTYPE'" >> ${CONFIG_DIR}/$CONFIG
+    echo "USERNAME='$BUILD_USERNAME'" >> ${CONFIG_DIR}/$CONFIG
 
     # Create users group
@@ -313 +313 @@
 
     # Create symlinks to start binaries
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VirtualBox
-    if [ -f $INSTALLATION_DIR/VirtualBoxVM ]; then
-        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VirtualBoxVM
-    fi
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxManage
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxSDL
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxVRDP
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxHeadless
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBalloonCtrl
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBugReport
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAutostart
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
-    ln -sf $INSTALLATION_DIR/vbox-img /usr/bin/vbox-img
-    ln -sf $INSTALLATION_DIR/VBox.png /usr/share/pixmaps/VBox.png
-    if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
-        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxDTrace
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VirtualBox
+    if [ -f "$INSTALLATION_DIR/VirtualBoxVM" ]; then
+        ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VirtualBoxVM
+    fi
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxManage
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxSDL
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxVRDP
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxHeadless
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxBalloonCtrl
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxBugReport
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxAutostart
+    ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/vboxwebsrv
+    ln -sf ${INSTALLATION_DIR}/vbox-img /usr/bin/vbox-img
+    ln -sf ${INSTALLATION_DIR}/VBox.png /usr/share/pixmaps/VBox.png
+    if [ -f "$INSTALLATION_DIR/VBoxDTrace" ]; then
+        ln -sf ${INSTALLATION_DIR}/VBox.sh /usr/bin/VBoxDTrace
     fi
     # Unity and Nautilus seem to look here for their icons
-    ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
-    ln -sf $INSTALLATION_DIR/virtualbox.desktop /usr/share/applications/virtualbox.desktop
-    ln -sf $INSTALLATION_DIR/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-    ln -sf $INSTALLATION_DIR/rdesktop-vrdp /usr/bin/rdesktop-vrdp
-    ln -sf $INSTALLATION_DIR/src/vboxhost /usr/src/vboxhost-_VERSION_
+    ln -sf ${INSTALLATION_DIR}/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
+    ln -sf ${INSTALLATION_DIR}/virtualbox.desktop /usr/share/applications/virtualbox.desktop
+    ln -sf ${INSTALLATION_DIR}/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+    ln -sf ${INSTALLATION_DIR}/rdesktop-vrdp /usr/bin/rdesktop-vrdp
+    ln -sf ${INSTALLATION_DIR}/src/vboxhost /usr/src/vboxhost-_VERSION_
 
     # Convenience symlinks. The creation fails if the FS is not case sensitive
     ln -sf VirtualBox /usr/bin/virtualbox > /dev/null 2>&1
-    if [ -f $INSTALLATION_DIR/VirtualBoxVM ]; then
+    if [ -f "$INSTALLATION_DIR/VirtualBoxVM" ]; then
         ln -sf VirtualBoxVM /usr/bin/virtualboxvm > /dev/null 2>&1
     fi
@@ -346 +346 @@
     ln -sf VBoxHeadless /usr/bin/vboxheadless > /dev/null 2>&1
     ln -sf VBoxBugReport /usr/bin/vboxbugreport > /dev/null 2>&1
-    if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
+    if [ -f "$INSTALLATION_DIR/VBoxDTrace" ]; then
         ln -sf VBoxDTrace /usr/bin/vboxdtrace > /dev/null 2>&1
     fi
 
     # Create legacy symlinks if necesary for Qt5/xcb stuff.
-    if [ -d $INSTALLATION_DIR/legacy ]; then
+    if [ -d "$INSTALLATION_DIR/legacy" ]; then
         if ! /sbin/ldconfig -p | grep -q "\<libxcb\.so\.1\>"; then
-            for f in `ls -1 $INSTALLATION_DIR/legacy/`; do
-                ln -s $INSTALLATION_DIR/legacy/$f $INSTALLATION_DIR/$f
-                echo $INSTALLATION_DIR/$f >> $CONFIG_DIR/$CONFIG_FILES
+            for f in `ls -1 ${INSTALLATION_DIR}/legacy/`; do
+                ln -s ${INSTALLATION_DIR}/legacy/$f ${INSTALLATION_DIR}/$f
+                echo ${INSTALLATION_DIR}/$f >> ${CONFIG_DIR}/$CONFIG_FILES
             done
         fi
@@ -362 +362 @@
     # Icons
     cur=`pwd`
-    cd $INSTALLATION_DIR/icons
+    cd ${INSTALLATION_DIR}/icons
     for i in *; do
         cd $i
@@ -373 +373 @@
                 fi
                 if [ -d /usr/share/icons/hicolor/$i/$dst ]; then
-                    ln -s $INSTALLATION_DIR/icons/$i/$j /usr/share/icons/hicolor/$i/$dst/$j
-                    echo /usr/share/icons/hicolor/$i/$dst/$j >> $CONFIG_DIR/$CONFIG_FILES
+                    ln -s ${INSTALLATION_DIR}/icons/$i/$j /usr/share/icons/hicolor/$i/$dst/$j
+                    echo /usr/share/icons/hicolor/$i/$dst/$j >> ${CONFIG_DIR}/$CONFIG_FILES
                 fi
             done
@@ -390 +390 @@
     # If Python is available, install Python bindings
     if [ -n "$PYTHON" ]; then
-      maybe_run_python_bindings_installer $INSTALLATION_DIR $CONFIG_DIR $CONFIG_FILES
+      maybe_run_python_bindings_installer ${INSTALLATION_DIR} ${CONFIG_DIR} $CONFIG_FILES
     fi
 
     # Do post-installation common to all installer types, currently service
     # script set-up.
-    if test "${BUILD_MODULE}" = "true"; then
+    if test "$BUILD_MODULE" = "true"; then
       START_SERVICES=
     else
       START_SERVICES="--nostart"
     fi
-    "${INSTALLATION_DIR}/prerm-common.sh" >> "${LOG}"
+    "$INSTALLATION_DIR/prerm-common.sh" >> "$LOG"
 
     # Now check whether the kernel modules were stopped.
     lsmod | grep -q vboxdrv && MODULES_STOPPED=
 
-    "${INSTALLATION_DIR}/postinst-common.sh" ${START_SERVICES} >> "${LOG}"
+    "$INSTALLATION_DIR/postinst-common.sh" ${START_SERVICES} >> "$LOG"
 
     info ""
@@ -420 +420 @@
     # And do a final test as to whether the kernel modules were properly created
     # and loaded.  Return 0 if both are true, 1 if not.
-    test -n "${MODULES_STOPPED}" &&
+    test -n "$MODULES_STOPPED" &&
         modinfo vboxdrv >/dev/null 2>&1 &&
         lsmod | grep -q vboxdrv ||

trunk/src/VBox/Installer/linux/postinst-common.sh

@@ -30 +30 @@
 TARGET=`readlink -e -- "${0}"` || exit 1
 MY_PATH="${TARGET%/[!/]*}"
-cd "${MY_PATH}"
+cd "$MY_PATH"
 . "./routines.sh"
 
@@ -53 +53 @@
 
 # Install runlevel scripts and systemd unit files
-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
+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
 finish_init_script_install
 
@@ -68 +68 @@
 addrunlevel vboxweb-service
 
-ln -sf "${MY_PATH}/postinst-common.sh" /sbin/vboxconfig
+ln -sf "$MY_PATH/postinst-common.sh" /sbin/vboxconfig
 
 # Set SELinux permissions
 # XXX SELinux: allow text relocation entries
 if [ -x /usr/bin/chcon ]; then
-    chcon -t texrel_shlib_t "${MY_PATH}"/*VBox* > /dev/null 2>&1
-    chcon -t texrel_shlib_t "${MY_PATH}"/VBoxAuth.so \
+    chcon -t texrel_shlib_t ${MY_PATH}/*VBox* > /dev/null 2>&1
+    chcon -t texrel_shlib_t ${MY_PATH}/VBoxAuth.so \
         > /dev/null 2>&1
-    chcon -t texrel_shlib_t "${MY_PATH}"/VirtualBox.so \
+    chcon -t texrel_shlib_t ${MY_PATH}/VirtualBox.so \
         > /dev/null 2>&1
-    chcon -t texrel_shlib_t "${MY_PATH}"/components/VBox*.so \
+    chcon -t texrel_shlib_t ${MY_PATH}/components/VBox*.so \
         > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VirtualBox > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VBoxSDL > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VBoxHeadless \
+    chcon -t java_exec_t    ${MY_PATH}/VirtualBox > /dev/null 2>&1
+    chcon -t java_exec_t    ${MY_PATH}/VBoxSDL > /dev/null 2>&1
+    chcon -t java_exec_t    ${MY_PATH}/VBoxHeadless \
         > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VBoxNetDHCP \
+    chcon -t java_exec_t    ${MY_PATH}/VBoxNetDHCP \
         > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VBoxNetNAT \
+    chcon -t java_exec_t    ${MY_PATH}/VBoxNetNAT \
         > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/VBoxExtPackHelperApp \
+    chcon -t java_exec_t    ${MY_PATH}/VBoxExtPackHelperApp \
         > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/vboxwebsrv > /dev/null 2>&1
-    chcon -t bin_t          "${MY_PATH}"/src/vboxhost/build_in_tmp \
+    chcon -t java_exec_t    ${MY_PATH}/vboxwebsrv > /dev/null 2>&1
+    chcon -t bin_t          ${MY_PATH}/src/vboxhost/build_in_tmp \
          > /dev/null 2>&1
     chcon -t bin_t          /usr/share/virtualbox/src/vboxhost/build_in_tmp \
@@ -97 +97 @@
 fi
 
-test -n "${START}" &&
+test -n "$START" &&
 {
-    if ! "${MY_PATH}/vboxdrv.sh" setup; then
-        "${MY_PATH}/check_module_dependencies.sh" >&2
+    if ! "$MY_PATH/vboxdrv.sh" setup; then
+        "$MY_PATH/check_module_dependencies.sh" >&2
         echo >&2
         echo "There were problems setting up VirtualBox.  To re-start the set-up process, run" >&2

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

@@ -39 +39 @@
 
 # Find previous installation
-if [ -r $CONFIG_DIR/$CONFIG ]; then
-    . $CONFIG_DIR/$CONFIG
-    PREV_INSTALLATION=$INSTALL_DIR
+if [ -r "$CONFIG_DIR/$CONFIG" ]; then
+    . ${CONFIG_DIR}/$CONFIG
+    PREV_INSTALLATION=${INSTALL_DIR}
 fi
 
@@ -93 +93 @@
   /usr/bin/vboxdtrace \
   /usr/bin/vboxbugreport \
-  $PREV_INSTALLATION/components/VBoxVMM.so \
-  $PREV_INSTALLATION/components/VBoxREM.so \
-  $PREV_INSTALLATION/components/VBoxRT.so \
-  $PREV_INSTALLATION/components/VBoxDDU.so \
-  $PREV_INSTALLATION/components/VBoxXPCOM.so \
+  ${PREV_INSTALLATION}/components/VBoxVMM.so \
+  ${PREV_INSTALLATION}/components/VBoxREM.so \
+  ${PREV_INSTALLATION}/components/VBoxRT.so \
+  ${PREV_INSTALLATION}/components/VBoxDDU.so \
+  ${PREV_INSTALLATION}/components/VBoxXPCOM.so \
   2> /dev/null
 
 cwd=`pwd`
-if [ -f $PREV_INSTALLATION/src/Makefile ]; then
-    cd $PREV_INSTALLATION/src
+if [ -f ${PREV_INSTALLATION}/src/Makefile ]; then
+    cd ${PREV_INSTALLATION}/src
     make clean > /dev/null 2>&1
 fi
-if [ -f $PREV_INSTALLATION/src/vboxdrv/Makefile ]; then
-    cd $PREV_INSTALLATION/src/vboxdrv
+if [ -f ${PREV_INSTALLATION}/src/vboxdrv/Makefile ]; then
+    cd ${PREV_INSTALLATION}/src/vboxdrv
     make clean > /dev/null 2>&1
 fi
-if [ -f $PREV_INSTALLATION/src/vboxnetflt/Makefile ]; then
-    cd $PREV_INSTALLATION/src/vboxnetflt
+if [ -f ${PREV_INSTALLATION}/src/vboxnetflt/Makefile ]; then
+    cd ${PREV_INSTALLATION}/src/vboxnetflt
     make clean > /dev/null 2>&1
 fi
-if [ -f $PREV_INSTALLATION/src/vboxnetadp/Makefile ]; then
-    cd $PREV_INSTALLATION/src/vboxnetadp
+if [ -f ${PREV_INSTALLATION}/src/vboxnetadp/Makefile ]; then
+    cd ${PREV_INSTALLATION}/src/vboxnetadp
     make clean > /dev/null 2>&1
 fi
-if [ -f $PREV_INSTALLATION/src/vboxpci/Makefile ]; then
-    cd $PREV_INSTALLATION/src/vboxpci
+if [ -f ${PREV_INSTALLATION}/src/vboxpci/Makefile ]; then
+    cd ${PREV_INSTALLATION}/src/vboxpci
     make clean > /dev/null 2>&1
 fi
-cd $PREV_INSTALLATION
-if [ -r $CONFIG_DIR/$CONFIG_FILES ]; then
-    rm -f `cat $CONFIG_DIR/$CONFIG_FILES` 2> /dev/null
+cd ${PREV_INSTALLATION}
+if [ -r "$CONFIG_DIR/$CONFIG_FILES" ]; then
+    rm -f `cat ${CONFIG_DIR}/$CONFIG_FILES` 2> /dev/null
 elif [ -n "$DEFAULT_FILES" -a -r "$DEFAULT_FILES" ]; then
     DEFAULT_FILE_NAMES=""
@@ -131 +131 @@
     done
 fi
-for file in `find $PREV_INSTALLATION 2> /dev/null`; do
+for file in `find ${PREV_INSTALLATION} 2> /dev/null`; do
     rmdir -p $file 2> /dev/null
 done
 cd $cwd
-mkdir -p $PREV_INSTALLATION 2> /dev/null # The above actually removes the current directory and parents!
-rmdir $PREV_INSTALLATION 2> /dev/null
-rm -r $CONFIG_DIR/$CONFIG 2> /dev/null
+mkdir -p ${PREV_INSTALLATION} 2> /dev/null # The above actually removes the current directory and parents!
+rmdir ${PREV_INSTALLATION} 2> /dev/null
+rm -r ${CONFIG_DIR}/$CONFIG 2> /dev/null
 
 if [ -z "$VBOX_NO_UNINSTALL_MESSAGE" ]; then
-    rm -r $CONFIG_DIR/$CONFIG_FILES 2> /dev/null
-    rmdir $CONFIG_DIR 2> /dev/null
+    rm -r ${CONFIG_DIR}/$CONFIG_FILES 2> /dev/null
+    rmdir ${CONFIG_DIR} 2> /dev/null
     [ -n "$INSTALL_REV" ] && INSTALL_REV=" r$INSTALL_REV"
     info "VirtualBox $INSTALL_VER$INSTALL_REV has been removed successfully."