Changeset 77077 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2019 2:38:49 PM (6 years ago)

Author:

vboxsync

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

128530

Message:

Additions/linux/installer: correctly detect the Oracle Linux RPMs.
bugref:3809: Linux installer maintenance
Since the Oracle Linux RPMs use the normal Additions installer as a basis,
the installer failed to detect them as a different type of installation.
Fortunately they removed the uninstall script, causing this installer to fail
early. This change adds script to detect them via the missing uninstall
script.

File:

• trunk/src/VBox/Additions/linux/installer/install.sh.in (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -352 +352 @@
 INSTALL_DIR=""
 uninstalled=0
-test -r "$CONFIG_DIR/$CONFIG" &&
-    eval `grep ^INSTALL_DIR= "$CONFIG_DIR/$CONFIG"` 2>/dev/null &&
-    eval `grep ^UNINSTALLER= "$CONFIG_DIR/$CONFIG"` 2>/dev/null
-if test -n "$INSTALL_DIR" -a -x "$INSTALL_DIR/$UNINSTALLER"; then
+test -r "$CONFIG_DIR/$CONFIG" && . "$CONFIG_DIR/$CONFIG"
+if test -n "$INSTALL_DIR" && test -n "$UNINSTALLER" &&
+    test -x "$INSTALL_DIR/$UNINSTALLER"; then
   "$INSTALL_DIR/$UNINSTALLER" $NO_CLEANUP 1>&2 ||
     abort "Failed to remove existing installation.  Aborting..."