Adding upstream version 1.156.1.

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

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 7753154..51780d2 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -27,6 +27,12 @@ fi
 
 . /scripts/live-functions
 
+if [ -z "${USERNAME}" ]
+then
+       echo "No default user for accessibility options."
+       exit 0
+fi
+
 log_begin_msg "Configuring accessibility options"
 
 # live-initramfs script
@@ -41,6 +47,15 @@ gct ()
        fi
 }
 
+laptop_detect ()
+{
+       if chroot /root /usr/sbin/laptop-detect
+       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
+       fi
+}
+
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -62,14 +77,17 @@ case ${ACCESS} in
                # Moderate Visual Impairment
                gct -s -t bool /desktop/gnome/interface/accessibility true
                gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                gct -s -t bool /apps/gksu/disable-grab true
+               gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
-               if type orca > /dev/null 2>&1
+               if [ -x /root/usr/bin/orca ]
                then
                        mkdir -p /root/home/${USERNAME}/.orca
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;
@@ -80,23 +98,27 @@ case ${ACCESS} in
                #gct -s -t bool /desktop/gnome/sound/enable_esd false
                gct -s -t bool /desktop/gnome/interface/accessibility true
                gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+
                ;;
 
        braille=ask)
                # Braille
                gct -s -t bool /desktop/gnome/interface/accessibility true
                gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
-               if type orca > /dev/null 2>&1
+               if [ -x /root/usr/bin/orca ]
                then
                        mkdir -p /root/home/${USERNAME}/.orca
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;