X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=314496dd5cc514a29417823ed1887cc49b02bdd3;hb=cabcd3723fc124a3816f7e992912189e65c7b382;hp=17defbf3ee8f48e8d4c8b271e91bf31cbb18d91d;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 17defbf..314496d 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -35,17 +35,9 @@ gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gc
 
 gct ()
 {
-	if [ "$gconf_version" ]
+	if [ "${gconf_version}" ]
 	then
-		chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
-	fi
-}
-
-kderc_addtoprefixes ()
-{
-	if [ -e "/root/etc/kderc" ]
-	then
-		sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
+		chroot /root sudo -u "${USERNAME}" gconftool-2 "${@}"
 	fi
 }
 
@@ -64,13 +56,6 @@ 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)
@@ -79,12 +64,12 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
 
-		if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+		if type orca > /dev/null 2>&1
 		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 "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
 		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)
@@ -102,9 +87,11 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
 
-		if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+		if type orca > /dev/null 2>&1
 		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 "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
 		fi
 		;;
 
@@ -120,8 +107,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 +122,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