X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=45d1aa1c00907495516d935aa30fd44ab3924a27;hb=24b9fd1c70013f5847d3a4658e56bd44534e7890;hp=1799e0ec4fb624f2814b1b2144ba5350867d6469;hpb=dc3fbe9cdabb2cbc257b0911dbbc91624c8ae5ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 1799e0e..45d1aa1 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))"
 
@@ -102,6 +90,7 @@ case ${ACCESS} in
 		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
+		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
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -109,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
 		;;
@@ -123,11 +111,22 @@ case ${ACCESS} in
 		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
+		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
+			touch /root/home/$USERNAME/.pulse_a11y_nostart
+			chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.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)
@@ -137,6 +136,7 @@ case ${ACCESS} in
 		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
+		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
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -148,6 +148,15 @@ case ${ACCESS} in
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 
+		if [ -x /root/usr/bin/pulse-session ]
+		then
+			touch /root/home/$USERNAME/.pulse_a11y_nostart
+			chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.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
 		;;