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 4726a75..51780d2 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -27,7 +27,13 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring accessibility options..."
+if [ -z "${USERNAME}" ]
+then
+       echo "No default user for accessibility options."
+       exit 0
+fi
+
+log_begin_msg "Configuring accessibility options"
 
 # live-initramfs script
 
@@ -41,11 +47,12 @@ gct ()
        fi
 }
 
-kderc_addtoprefixes ()
+laptop_detect ()
 {
-       if [ -e "/root/etc/kderc" ]
+       if chroot /root /usr/sbin/laptop-detect
        then
-               sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
+               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
 }
 
@@ -64,27 +71,25 @@ case ${ACCESS} in
                gct -s -t string /desktop/gnome/background/color_shading_type solid
                gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
-
-               kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
-
-               if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]
-               then
-                       cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
-               fi
                ;;
 
        access=v2)
                # 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 [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+               if [ -x /root/usr/bin/orca ]
                then
-                       sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
+                       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
-
-               kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
                ;;
 
        access=v3)
@@ -93,18 +98,28 @@ 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 [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+               if [ -x /root/usr/bin/orca ]
                then
-                       sed -i '/^enableSpeech\W/ s/True/False/;/^enableBraille/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
+                       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
                ;;
 
@@ -120,8 +135,6 @@ case ${ACCESS} in
                gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
                gct -s -t bool /apps/gksu/disable-grab true
 
-               kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
-
                if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]
                then
                        sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
@@ -137,8 +150,6 @@ case ${ACCESS} in
                gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
 
-               kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
-
                if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]
                then
                        sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml