Changeset 33428 in vbox for trunk

Timestamp:

Oct 25, 2010 2:37:39 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/Installer: shell version of the xorg.conf hacking script

File:

• trunk/src/VBox/Additions/x11/Installer/x11config.sh (copied) (copied from trunk/src/VBox/Additions/x11/Installer/x11config-new.pl ) (6 diffs)

trunk/src/VBox/Additions/x11/Installer/x11config.sh

@@ -1 @@
-#!/usr/bin/perl -w
+#!/bin/sh
 #
 # Guest Additions X11 config update script
@@ -14 +14 @@
 #
 
-my $auto_mouse = 0;
-my $new_mouse = 0;
-my $no_bak = 0;
-my $old_mouse_dev = "/dev/psaux";
+auto_mouse=""
+new_mouse=""
+no_bak=""
+old_mouse_dev="/dev/psaux"
 
-foreach $arg (@ARGV)
+tab=`printf '\t'`
+
+ALL_SECTIONS=\
+'^[ '$tab']*[Ss][Ee][Cc][Tt][Ii][Oo][Nn][ '$tab']*'\
+'"\([Ii][Nn][Pp][Uu][Tt][Dd][Ee][Vv][Ii][Cc][Ee]\|'\
+'[Dd][Ee][Vv][Ii][Cc][Ee]\|'\
+'[Ss][Ee][Rr][Vv][Ee][Rr][Ll][Aa][Yy][Oo][Uu][Tt]\|'\
+'[Ss][Cc][Rr][Ee][Ee][Nn]\|'\
+'[Mm][Oo][Nn][Ii][Tt][Oo][Rr]\|'\
+'[Kk][Ee][Yy][Bb][Oo][Aa][Rr][Dd]\|'\
+'[Pp][Oo][Ii][Nn][Tt][Ee][Rr]\)"'
+# ^\s*Section\s*"(InputDevice|Device|ServerLayout|Screen|Monitor|Keyboard|Pointer)"
+
+KBD_SECTION='[Kk][Ee][Yy][Bb][Oo][Aa][Rr][Dd]' # Keyboard
+
+END_SECTION='[Ee][Nn][Dd][Ss][Ee][Cc][Tt][Ii][Oo][Nn]' # EndSection
+
+OPT_XKB='^[ '$tab']*option[ '$tab'][ '$tab']*"xkb'
+
+DRIVER_KBD='^[ '$tab']*[Dd][Rr][Ii][Vv][Ee][Rr][ '$tab'][ '$tab']*'\
+'"\(kbd\|keyboard\)"'
+# ^\s*driver\s+\"(kbd|keyboard)\"
+
+reconfigure()
 {
-    if (lc($arg) eq "--automouse")
-    {
-        $auto_mouse = 1;
-    }
-    elsif (lc($arg) eq "--newmouse")
-    {
-        $new_mouse = 1;
-    }
-    elsif (lc($arg) eq "--nobak")
-    {
-        $no_bak = 1;
-    }
-    elsif (lc($arg) eq "--nopsaux")
-    {
-        $old_mouse_dev = "/dev/input/mice";
-    }
-    else
-    {
-        my $cfg = $arg;
-        my $CFG;
-        my $xkbopts = "";
-        my $kb_driver = "";
-        my $layout_kb = "";
-        if (open(CFG, $cfg))
-        {
-            my $TMP;
-            my $temp = $cfg.".vbox.tmp";
-            open(TMP, ">$temp") or die "Can't create $TMP: $!\n";
-
-            my $in_section = 0;
-            print TMP "# VirtualBox generated configuration file\n";
-            print TMP "# based on $cfg.\n";
-
-            while (defined ($line = <CFG>))
-            {
-                if ($line =~ /^\s*Section\s*"([a-zA-Z]+)"/i)
-                {
-                    my $section = lc($1);
-                    if (   ($section eq "inputdevice")
-                        || ($section eq "device")
-                        || ($section eq "serverlayout")
-                        || ($section eq "screen")
-                        || ($section eq "monitor")
-                        || ($section eq "keyboard")
-                        || ($section eq "pointer"))
-                    {
-                        $in_section = 1;
-                    }
-                } else {
-                    if ($line =~ /^\s*EndSection/i)
-                    {
-                        $line = "# " . $line unless $in_section eq 0;
-                        $in_section = 0;
-                    }
-                }
-
-                if ($in_section)
-                {
-                    # Remember XKB options
-                    if ($line =~ /^\s*option\s+\"xkb/i)
-                    {
-                        $xkbopts = $xkbopts . $line;
-                    }
-                    # If we find a keyboard driver, remember it
-                    if ($line =~ /^\s*driver\s+\"(kbd|keyboard)\"/i)
-                    {
-                        $kb_driver = $1;
-                    }
-                    $line = "# " . $line;
-                }
-                print TMP $line;
-            }
-
-            if ($kb_driver ne "")
-            {
-                print TMP <<EOF;
+    cfg="$1"
+    tmp="$cfg.vbox.tmp"
+    test -w "$cfg" || { echo "$cfg does not exist"; return; }
+    rm -f "$tmp"
+    test ! -e "$tmp" || { echo "Failed to delete $tmp"; return; }
+    touch "$tmp"
+    test -w "$tmp" || { echo "Failed to create $tmp"; return; }
+    xkb_opts="`cat "$cfg" | sed -n -e "/$KBD_SECTION/,/$END_SECTION/p" |
+              grep -i "$OPT_XKB"`"
+    kbd_drv="`cat "$cfg" | sed -n -e "/$KBD_SECTION/,/$END_SECTION/p" |
+             sed -n -e "0,/$DRIVER_KBD/s/$DRIVER_KBD/\\1/p"`"
+    cat > "$tmp" << EOF
+# VirtualBox generated configuration file
+# based on $cfg.
+EOF
+    cat "$cfg" | sed -e "/$ALL_SECTIONS/,/$END_SECTION/s/\\(.*\\)/# \\1/" >> "$tmp"
+    test -n "$kbd_drv" && cat >> "$tmp" << EOF
 Section "InputDevice"
   Identifier   "Keyboard[0]"
-  Driver       "$kb_driver"
-$xkbopts  Option       "Protocol" "Standard"
+  Driver       "$kbd_drv"
+$xkb_opts
+  Option       "Protocol" "Standard"
   Option       "CoreKeyboard"
 EndSection
 EOF
-               $layout_kb = "  InputDevice  \"Keyboard[0]\" \"CoreKeyboard\"\n"
-            }
-
-            if (!$auto_mouse && !$new_mouse) {
-                print TMP <<EOF;
+    kbd_layout=""
+    test -n "$kbd_drv" && kbd_layout='  InputDevice  "Keyboard[0]" "CoreKeyboard"'
+    test -z "$auto_mouse" -a -z "$new_mouse" && cat >> $tmp << EOF
 
 Section "InputDevice"
@@ -124 +87 @@
 Section "ServerLayout"
   Identifier   "Layout[all]"
-$layout_kb  InputDevice  "Mouse[1]" "CorePointer"
+$kbd_layout
+  InputDevice  "Mouse[1]" "CorePointer"
   Option       "Clone" "off"
   Option       "Xinerama" "off"
@@ -130 +94 @@
 EndSection
 EOF
-            }
 
-            if (!$auto_mouse && $new_mouse) {
-                print TMP <<EOF;
+    test -z "$auto_mouse" -a -n "$new_mouse" &&
+        cat >> "$tmp" << EOF
 
 Section "InputDevice"
@@ -166 +129 @@
 EndSection
 EOF
-            }
 
-            print TMP <<EOF;
+    cat >> "$tmp" << EOF
 
 Section "Monitor"
@@ -192 +154 @@
 EndSection
 EOF
-            close(TMP);
 
-            system("cp", $cfg, $cfg.".vbox") unless
-                ($no_bak eq 1 || -e $cfg.".vbox");
-            rename $cfg, $cfg.".bak" unless $no_bak eq 1;
-            rename $temp, $cfg;
-        }
-    }
+    test -n "$no_bak" -o -f "$cfg.vbox" || cp "$cfg" "$cfg.vbox"
+    test -n "$no_bak" || mv "$cfg" "$cfg.bak"
+    mv "$tmp" "$cfg"
 }
-exit 0
+
+while test -n "$1"
+do
+    case "$1" in
+        --autoMouse)
+            auto_mouse=1 ;;
+        --newMouse)
+            new_mouse=1 ;;
+        --noBak)
+            no_bak=1 ;;
+        --nopsaux)
+            old_mouse_dev="/dev/input/mice" ;;
+        *)
+            reconfigure "$1" ;;
+    esac
+    shift
+done