Changeset 36626 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Apr 8, 2011 3:31:31 PM (14 years ago)

Author:

vboxsync

Message:

Installer/linux: fix quoting in the Additions auto-installer

File:

• trunk/src/VBox/Additions/linux/installer/autorun.sh (modified) (3 diffs)

trunk/src/VBox/Additions/linux/installer/autorun.sh

@@ -1 +1 @@
 #!/bin/sh
 #
-# VirtualBox Guest Additions installation script for Linux
+# VirtualBox Guest Additions installation script for *nix guests
 #
 
@@ -17 +17 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
+
+# Deal with differing "which" semantics
+mywhich() {
+    which "$1" 2>/dev/null | grep -v "no $1"
+}
+
+# Get the name and execute switch for a useful terminal emulator
+#
+# Sets $gxtpath to the emulator path or empty
+# Sets $gxttitle to the "title" switch for that emulator
+# Sets $gxtexec to the "execute" switch for that emulator
+# May clobber $gtx*
+# Calls mywhich
+getxterm() {
+    # gnome-terminal uses -e differently to other emulators
+    for gxti in "gnome-terminal --title -x" "konsole --title -e" "xterm -T -e"; do
+        set $gxti
+        gxtpath="`mywhich $1`"
+        case "$gxtpath" in ?*)
+            gxttitle=$2
+            gxtexec=$3
+            return
+            ;;
+        esac
+    done
+}
+
+# Quotes its argument by inserting '\' in front of every character save
+# for 'A-Za-z0-9/'.  Prints the result to stdout.
+quotify() {
+    echo "$1" | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
+}
 
 ostype=`uname -s`
@@ -44 +76 @@
         "$path/VBoxLinuxAdditions-$arch.run"; do
         if test -f "$i"; then
-            exec /bin/sh "$path/runasroot.sh" \
-                "VirtualBox Guest Additions installation" "$i" \
-                "Please try running $i manually."
+            getxterm
+            case "$gxtpath" in ?*)
+                TITLE="VirtualBox Guest Additions installation"
+                TITLE_QUOTED=`quotify "$TITLE"`
+                BINARY=`quotify $i`
+                exec /bin/sh "$path/runasroot.sh" \
+                    "$TITLE" \
+                    "$gxtpath $gxttitle $TITLE_QUOTED $gxtexec $BINARY --xwin" \
+                    "Please try running $i manually."
+                exit
+                ;;
+            esac
         fi
     done