Changeset 92628 in vbox

Timestamp:

Nov 29, 2021 3:56:02 PM (3 years ago)

Author:

vboxsync

Message:

Installer/linux: Coding style improvement to uninstall.sh.

File:

• trunk/src/VBox/Installer/linux/uninstall.sh (modified) (3 diffs)

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
 
@@ -56 +56 @@
 # Remove kernel module installed
 if [ -z "$VBOX_DONT_REMOVE_OLD_MODULES" ]; then
-    rm -f /usr/src/vboxhost-$INSTALL_VER 2> /dev/null
-    rm -f /usr/src/vboxdrv-$INSTALL_VER 2> /dev/null
-    rm -f /usr/src/vboxnetflt-$INSTALL_VER 2> /dev/null
-    rm -f /usr/src/vboxnetadp-$INSTALL_VER 2> /dev/null
-    rm -f /usr/src/vboxpci-$INSTALL_VER 2> /dev/null
+    rm -f "/usr/src/vboxhost-$INSTALL_VER" 2> /dev/null
+    rm -f "/usr/src/vboxdrv-$INSTALL_VER" 2> /dev/null
+    rm -f "/usr/src/vboxnetflt-$INSTALL_VER" 2> /dev/null
+    rm -f "/usr/src/vboxnetadp-$INSTALL_VER" 2> /dev/null
+    rm -f "/usr/src/vboxpci-$INSTALL_VER" 2> /dev/null
 fi
 
@@ -99 +99 @@
   /usr/bin/vboxaudiotest \
   /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/VBoxREM.so \
-  $PREV_INSTALLATION/VBoxVRDP \
-  $PREV_INSTALLATION/VBoxVRDP.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" \
+  "$PREV_INSTALLATION/VBoxREM.so" \
+  "$PREV_INSTALLATION/VBoxVRDP" \
+  "$PREV_INSTALLATION/VBoxVRDP.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=""
-    . $DEFAULT_FILES
-    for i in "$DEFAULT_FILE_NAMES"; do
-        rm -f $i 2> /dev/null
-    done
+    . "$DEFAULT_FILES"
+    rm -f $DEFAULT_FILE_NAMES 2> /dev/null
 fi
-for file in `find $PREV_INSTALLATION 2> /dev/null`; do
-    rmdir -p $file 2> /dev/null
+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
+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 -f "$CONFIG_DIR/$CONFIG" 2> /dev/null
+rm -f "$CONFIG_DIR/$CONFIG_FILES" 2> /dev/null
+rmdir "$CONFIG_DIR" 2> /dev/null
+
+update-mime-database /usr/share/mime >/dev/null 2>&1
 
 if [ -z "$VBOX_NO_UNINSTALL_MESSAGE" ]; then
-    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."
     log "Successfully $INSTALL_VER$INSTALL_REV removed VirtualBox."
 fi
-update-mime-database /usr/share/mime >/dev/null 2>&1