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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 7f44df3007a8bc77b6b88aabfb0afbf790c0c5fd
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Aug 31 11:44:31 2009 +0200

    Added perl to binaries required for debootstrap

diff --git a/install.sh b/install.sh
index db50e06..7d13361 100755
--- a/install.sh
+++ b/install.sh
@@ -549,25 +549,42 @@ __END__
 #
 # Stage test
 #
+
 action_testing () {
 	echo "Testing system setup"
 
-	if ! test -e $SD_DEVICE; then
-		echo "E: Could not find microSD card device file $SD_DEVICE"
-		exit 1
+	intern_packages_required="wget ping fdisk mount umount mkfs.$SD_PART1_FS mkswap gunzip dd sed rdate ar"
+	if [ "mkfs.$SD_PART2_FS" != "mkfs.$SD_PART1_FS" ]; then
+		intern_packages_required="$intern_packages_required mkfs.$SD_PART2_FS"
+	fi
+	if [ "deboostrap" = "$BOOTSTRAPPER" ]; then
+		intern_packages_required="$intern_packages_required perl"
 	fi
-	echo " * microSD card device: $SD_DEVICE present"
 
-	for intern_binary in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate ar; do
+	intern_packages_missing=""
+	for intern_binary in $intern_packages_required; do
 		if ! which $intern_binary > /dev/null; then
-			echo "E: Could not find $intern_binary binary"
-			exit 1
+			if [ -n "$VERBOSE" ]; then
+				echo " * Missing binary '$intern_binary'"
+			fi
+			intern_packages_missing="$intern_packages_missing $intern_binary"
 		fi
 		if [ -n "$VERBOSE" ]; then
 			echo " * $intern_binary installed"
 		fi
 	done
 
+	if [ -n "$intern_packages_missing" ]; then
+		echo "E: Could not find the following binaries: $intern_packages_missing"
+		exit 1
+	fi
+
+	if ! test -e $SD_DEVICE; then
+		echo "E: Could not find microSD card device file $SD_DEVICE"
+		exit 1
+	fi
+	echo " * microSD card device: $SD_DEVICE present"
+
 	if $TAR_APPLICATION --help 2>&1 | grep "Usage: $TAR_APPLICATION \-\[cxtvO\]" >/dev/null; then
 		echo "W: $TAR_APPLICATION does not support gzip archives"
 		echo "Downloading tar package"

-- 
Various non-packaged files