From 5b14619479966247ae58377f07dd98888a0a127e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Mon, 18 Mar 2013 20:58:35 +0100
Subject: [PATCH] Make ubiquity disable orca in target if it was turned off by
the user during installation
---
helpers/make-ubiquity | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 23389969..67f2558e 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=5
+VERSION=8
. ./config
@@ -60,7 +60,7 @@ for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
do
echo Testing \$i
TIME=\$(date +%s%N)
- wget -o /dev/null -O /dev/null \$i/speedtest || continue
+ wget -t 1 -T 5 --max-redirect=0 -o /dev/null -O /dev/null \$i/speedtest || continue
TIME2=\$(date +%s%N)
ELAPSED=\$(expr \$TIME2 - \$TIME)
echo Time: \$ELAPSED
@@ -166,6 +166,11 @@ toolkit-accessibility=true
/desktop/gnome/interface/accessibility true" > /target/usr/share/gconf/defaults/91_accessibility
chroot /target update-gconf-defaults
+else
+ set +e
+ grep -q v3 /proc/cmdline && exit
+ echo "Orca screen reader seems not to be running, disabling accessibility by default in target system"
+ rm /target/home/*/.local/share/orca/user-settings.conf -f
fi
EOF1
--
GitLab