X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=7681aeffbeaf52f2a8e41b1e8a0f14c7bd1e41d7;hb=cb4c686d047053c6c1eac2b8362c1fd077a19d36;hp=27ddb3c5dbc80bd57a42cbf0af44c744ebac83fe;hpb=7a0c17a65cce3a203f3e8bd29098010bb08300f7;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 27ddb3c..7681aef 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,19 +47,6 @@ gct ()
 	fi
 }
 
-laptop_detect ()
-{
-	if [ -x /root/usr/bin/orca ]
-	then
-		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
@@ -70,6 +57,7 @@ remove_applet ()
 	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 :)"
+	[ "$line_no" ] || return
 	prior_line="$((line_no-1))"
 	next_line="$((line_no+1))"
 
@@ -110,7 +98,6 @@ case ${ACCESS} in
 			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
 		;;
@@ -127,9 +114,20 @@ case ${ACCESS} in
 		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		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
+		if [ -x /root/usr/bin/pulse-session ]
+		then
+			mkdir -p /root/var/lib/pulseaudio
+			touch /root/var/lib/pulseaudio/.pulse_a11y_nostart
+			chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart
+			mkdir -p /root/home/$USERNAME/.pulse
+			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
+			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
+		fi
+		if [ -x /root/usr/bin/orca ]
+		then
+			mkdir -p /root/home/$USERNAME/.orca
+			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
+		fi
 		;;
 
 	braille=ask)
@@ -151,6 +149,16 @@ case ${ACCESS} in
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 
+		if [ -x /root/usr/bin/pulse-session ]
+		then
+			mkdir -p /root/var/lib/pulseaudio
+			touch /root/var/lib/pulseaudio/.pulse_a11y_nostart
+			chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart
+			mkdir -p /root/home/$USERNAME/.pulse
+			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
+			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
+		fi
+
 		remove_applet fast_user_switch
 		;;