summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-28 15:41:42 +0100
committerHolger Levsen <holger@layer-acht.org>2014-10-28 15:41:42 +0100
commit48976b4014ead5d3e6f813330bad22b52041a2cd (patch)
tree9a155f9a8ff9019ed317722cf83b5cbf81bdea84
parent6a3f3deb2c8f4d6052b89dbd1d90e0ca98853f66 (diff)
downloadjenkins.debian.net-48976b4014ead5d3e6f813330bad22b52041a2cd.tar.xz
g-i-i: use more quotes
-rw-r--r--bin/g-i-installation.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index d129a4f6..481942f0 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -307,7 +307,7 @@ backup_screenshot() {
}
do_and_report() {
- echo "$(date) $PRINTF_NR / $TOKEN - sending $@"
+ echo "$(date) $PRINTF_NR / $TOKEN - sending '$@'"
# Workaround #758881: vncdo type command sending "e" chars sometimes not
# received, sometimes received as if "e" key was kept pressed.
if [ "$1" = "type" ]; then
@@ -316,7 +316,7 @@ do_and_report() {
vncdo -s $DISPLAY --delay=100 key ${typestr:$i:1}
done
else
- vncdo -s $DISPLAY $@
+ vncdo -s $DISPLAY "$@"
fi
backup_screenshot
}
@@ -682,11 +682,13 @@ post_install_boot() {
;;
0700) do_and_report key space
;;
- 0710) do_and_report type '-c 3 '
+ 0710) do_and_report type '-'
;;
- 0720) do_and_report type '8.8.8.8'
+ 0720) do_and_report type 'c 2 '
;;
- 0730) do_and_report key enter
+ 0730) do_and_report type '8.8.8.8'
+ ;;
+ 0740) do_and_report key enter
;;
0750) do_and_report type apt-get # apt-get install w3m
;;