Merging casper 1.145.

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

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index a169342..d838d76 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,16 +67,20 @@ case ${ACCESS} in
        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 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
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
+
+                       mkdir -p /root/home/${USERNAME}/.config/autostart
+                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
                fi
                ;;
 
@@ -85,25 +89,34 @@ case ${ACCESS} in
                # Disabled for now, until we know eSpeak works.
                #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 bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+
+               if [ -x /root/usr/bin/orca ]
+               then
+                       mkdir -p /root/home/${USERNAME}/.config/autostart
+                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
+               fi
                ;;
 
        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 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
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
+
+                       mkdir -p /root/home/${USERNAME}/.config/autostart
+                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
                fi
                ;;