From 2e5da0e7aeafb1b8cb275dfa769c389cb91d3911 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 25 Dec 2012 23:26:59 +0100
Subject: use vncdo slightly differently

---
 bin/g-i-installation.sh | 56 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 18 deletions(-)

(limited to 'bin')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 81ca8274..ad256081 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -239,24 +239,28 @@ normal_action() {
 							;;
 						210)	do_and_report key alt-f2
 							;;
-						220)	do_and_report type "iceweasel http://www.debian.org"
+						220)	do_and_report type "iceweasel"
 							;;
-						230)	do_and_report key enter
+						230)	do_and_report key space
+							;;
+						240)	do_and_report type "http://www.debian.org"
+							;;
+						250)	do_and_report key enter
 							;;
 						300)	do_and_report key alt-f2
 							;;
-						230)	do_and_report type xterm
+						310)	do_and_report type xterm
 							;;
 						320)	do_and_report key enter
 							;;
-						350)	do_and_report type "su -c poweroff"
-							# "alt-f4 right right enter" should also work
+						350)	# leave XFCE and shutdown
+							do_and_report key alt-f4
 							;;
-						370)	do_and_report key enter
+						360)	do_and_report key right
 							;;
-						380)	do_and_report type r00tme
+						370)	do_and_report key right
 							;;
-						400)	do_and_report key enter
+						380)	do_and_report key enter
 							;;
 						*)	;;
 				esac
@@ -264,9 +268,13 @@ normal_action() {
 		*lxde)		case $TOKEN in
 						200)	do_and_report key alt-f2
 							;;
-						210)	do_and_report type "iceweasel http://www.debian.org"
+						210)	do_and_report type "iceweasel"
+							;;
+						230)	do_and_report key space
 							;;
-						220)	do_and_report key enter
+						240)	do_and_report type "http://www.debian.org"
+							;;
+						250)	do_and_report key enter
 							;;
 						300)	do_and_report key alt-f2
 							;;
@@ -274,13 +282,17 @@ normal_action() {
 							;;
 						320)	do_and_report key enter
 							;;
-						350)	do_and_report type "su -c poweroff"
+						330)	do_and_report type "su"
+							;;
+						340)	do_and_report key enter
 							;;
-						370)	do_and_report key enter
+						350)	do_and_report type r00tme
 							;;
-						380)	do_and_report type r00tme
+						360)	do_and_report key enter
 							;;
-						400)	do_and_report key enter
+						370)	do_and_report type "poweroff"
+							;;
+						380)	do_and_report key enter
 							;;
 						*)	;;
 				esac
@@ -288,9 +300,13 @@ normal_action() {
 		*kde)		case $TOKEN in
 						200)	do_and_report key alt-f2
 							;;
-						210)	do_and_report type "konqueror http://www.debian.org"
+						210)	do_and_report type "konqueror"
+							;;
+						230)	do_and_report key space
 							;;
-						220)	do_and_report key enter
+						240)	do_and_report type "http://www.debian.org"
+							;;
+						250)	do_and_report key enter
 							;;
 						300)	do_and_report key alt-f2
 							;;
@@ -298,11 +314,15 @@ normal_action() {
 							;;
 						320)	do_and_report key enter
 							;;
-						350)	do_and_report type "su -c poweroff"
+						330)	do_and_report type "su"
+							;;
+						340)	do_and_report key enter
+							;;
+						350)	do_and_report type r00tme
 							;;
 						360)	do_and_report key enter
 							;;
-						370)	do_and_report type r00tme
+						370)	do_and_report type "poweroff"
 							;;
 						380)	do_and_report key enter
 							;;
-- 
cgit v1.2.3-70-g09d2