Merging casper 1.159.

[live-boot-grml.git] / scripts / live-bottom / 30accessibility

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 51780d2..1799e0e 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -49,13 +49,35 @@ gct ()
 
 laptop_detect ()
 {
-       if chroot /root /usr/sbin/laptop-detect
+       if [ -x /root/usr/bin/orca ]
        then
-               echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
-               echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+               if chroot /root /usr/sbin/laptop-detect
+               then
+                       mkdir -p /root/home/$USERNAME/.orca
+                       echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
+                       echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+               fi
        fi
 }
 
+remove_applet ()
+{
+       # Code to remove an applet from the default panel setup
+       # This is rather hacky, but I can't think of a one or two line regular
+       # expression to do this any more efficiently. Patches welcome. In
+       # addition, setting these via gconf also doesn't work for some reason.
+
+       local line_no prior_line next_line
+
+       line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+       prior_line="$((line_no-1))"
+       next_line="$((line_no+1))"
+
+       sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
+
+       chroot /root update-gconf-defaults
+}
+
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -102,6 +124,10 @@ case ${ACCESS} in
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
+               remove_applet fast_user_switch
+               laptop_detect
+               touch /root/etc/pulse/a11y_nostart
+               sed -i -e 's/autospawn = yes/autospawn = no/g' /root/etc/pulse/client.conf
                ;;
 
        braille=ask)
@@ -121,6 +147,8 @@ case ${ACCESS} in
                        laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
+
+               remove_applet fast_user_switch
                ;;
 
        access=m1)