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

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 51780d2..7681aef 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,13 +47,23 @@ gct ()
 	fi
 }
 
-laptop_detect ()
+remove_applet ()
 {
-	if chroot /root /usr/sbin/laptop-detect
-	then
-		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
+	# Code to remove an applet from the default panel setup
+	# This is rather hacky, but I can't think of a one or two line regular
+	# expression to do this any more efficiently. Patches welcome. In
+	# addition, setting these via gconf also doesn't work for some reason.
+
+	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))"
+
+	sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
+
+	chroot /root update-gconf-defaults
 }
 
 case ${ACCESS} in
@@ -80,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
@@ -87,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
 		;;
@@ -101,7 +111,23 @@ 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
+		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)
@@ -111,6 +137,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
@@ -121,6 +148,18 @@ case ${ACCESS} in
 			laptop_detect
 			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
 		;;
 
 	access=m1)