[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. c4f44c8d2c6703ce1a79632daf81959df941d85e

[Luca Capello]

The following commit has been merged in the master branch:
commit c4f44c8d2c6703ce1a79632daf81959df941d85e
Author: Luca Capello <luca at pca.it>
Date:   Tue Nov 18 00:49:17 2008 +0100

    install.sh: new function five_seconds_to_quit

diff --git a/install.sh b/install.sh
index 9ebe6ee..4b05787 100755
--- a/install.sh
+++ b/install.sh
@@ -89,6 +89,17 @@ umount_all () {
 	done
 }
 
+five_seconds_to_quit () {
+	# since dash doesn't support 'read' -t and -n options, this script
+	# should be executed only by /bin/bash.  However, all official
+	# Openmoko images use busybox, which doesn't provide /bin/bash
+	read -t 5 -n 1 VAR || VAR=continue
+	if [ "$VAR" != "continue" ]; then
+		echo "E: aborting on user request"
+		exit 1
+	fi
+}
+
 card_data_warning () {
 	cat <<__END__
 Starting to $1 the microSD card
@@ -101,16 +112,7 @@ This will destroy all the data on the microSD card!!!
 
 Press any key within 5 seconds to quit
 __END__
-
-	# since dash doesn't support 'read' -t and -n options, this script
-	# should be executed only by /bin/bash.  However, all official
-	# Openmoko images use busybox, which doesn't provide /bin/bash
-	read -t 5 -n 1 VAR || VAR=continue
-	if [ "$VAR" != "continue" ]; then
-		echo "E: aborting on user request"
-		exit 1
-	fi
-
+five_seconds_to_quit
 }
 
 

-- 
Various non-packaged files