Remove trailing space in scripts

r61883

13 files changed, 39 insertions, 39 deletions

diff --git a/scripts/debian/sarge b/scripts/debian/sarge
index 252e180..b929544 100644
--- a/scripts/debian/sarge
+++ b/scripts/debian/sarge
@@ -188,7 +188,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29 
+    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29
 
 #    if [ ! -e "$TARGET/etc/exim/exim.conf" ]; then
 #        mkdir -p "$TARGET/etc/exim"
diff --git a/scripts/debian/sarge.buildd b/scripts/debian/sarge.buildd
index 249a035..5c7e049 100644
--- a/scripts/debian/sarge.buildd
+++ b/scripts/debian/sarge.buildd
@@ -147,7 +147,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29 
+    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29
 
     info INSTBASE "Installing base packages..."
 
diff --git a/scripts/debian/sarge.fakechroot b/scripts/debian/sarge.fakechroot
index 2fe4a38..91ac662 100644
--- a/scripts/debian/sarge.fakechroot
+++ b/scripts/debian/sarge.fakechroot
@@ -153,7 +153,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29 
+    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29
 
     info INSTBASE "Installing base packages..."
 
diff --git a/scripts/debian/sid b/scripts/debian/sid
index fab6f42..aff53ce 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -17,7 +17,7 @@ esac
 work_out_debs () {
 	required="$(get_debs Priority: required)"
 
-	if doing_variant - || doing_variant fakechroot; then 
+	if doing_variant - || doing_variant fakechroot; then
 		#required="$required $(get_debs Priority: important)"
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
@@ -27,7 +27,7 @@ work_out_debs () {
 		base="apt"
 	fi
 
-	if doing_variant fakechroot; then 
+	if doing_variant fakechroot; then
 		# ldd.fake needs binutils
 		required="$required binutils"
 	fi
@@ -51,7 +51,7 @@ first_stage_install () {
 		cp "$TARGET/usr/bin/md5sum.textutils" "$TARGET/usr/bin/md5sum"
 	fi
 
-	if doing_variant fakechroot; then 
+	if doing_variant fakechroot; then
 		setup_devices_fakechroot
 	else
 		setup_devices
@@ -84,7 +84,7 @@ second_stage_install () {
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
-	if doing_variant fakechroot; then 
+	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	elif doing_variant scratchbox; then
 		true
@@ -113,7 +113,7 @@ second_stage_install () {
 		ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
 	fi
 
-	if doing_variant fakechroot; then 
+	if doing_variant fakechroot; then
 		install_fakechroot_tools
 	fi
 
@@ -139,7 +139,7 @@ second_stage_install () {
 
 	exec 7>&1
 
-	smallyes '' | 
+	smallyes '' |
 	  (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
 	   dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
 	  dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
@@ -155,7 +155,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
 	setup_dselect_method apt
 
-	smallyes '' | 
+	smallyes '' |
 	  (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
 	   dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
 	  dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
@@ -179,7 +179,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 		done_predeps="$done_predeps $predep"
 	done
 
-	smallyes '' | 
+	smallyes '' |
 	  (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
 	   dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
 	  dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
@@ -190,7 +190,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 	  (repeatn 5 in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \
 	   dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
 	  dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
-  
+
 	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
 
 	progress $bases $bases CONFBASE "Configuring base system"
diff --git a/scripts/debian/woody b/scripts/debian/woody
index d174be8..fa0920a 100644
--- a/scripts/debian/woody
+++ b/scripts/debian/woody
@@ -173,7 +173,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29 
+    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29
 
     if [ ! -e "$TARGET/etc/exim/exim.conf" ]; then
         mkdir -p "$TARGET/etc/exim"
diff --git a/scripts/debian/woody.buildd b/scripts/debian/woody.buildd
index 06cb8e3..2942478 100644
--- a/scripts/debian/woody.buildd
+++ b/scripts/debian/woody.buildd
@@ -147,7 +147,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29 
+    p 10; progress $baseprog $bases INSTBASE "Installing base system" #29
 
     info INSTBASE "Installing base packages..."
 
diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy
index 2646ca2..2148cec 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/ubuntu/breezy
@@ -12,7 +12,7 @@ esac
 work_out_debs () {
     required="$(get_debs Priority: required)"
 
-    if doing_variant -; then 
+    if doing_variant -; then
       #required="$required $(get_debs Priority: important)"
       #  ^^ should be getting debconf here somehow maybe
       base="$(get_debs Priority: important)"
@@ -118,7 +118,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
@@ -134,7 +134,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     setup_dselect_method apt
 
-    smallyes '' | 
+    smallyes '' |
       (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
       dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
@@ -144,7 +144,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper
index e57680a..af83c0c 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/ubuntu/dapper
@@ -19,7 +19,7 @@ esac
 work_out_debs () {
     required="$(get_debs Priority: required)"
 
-    if doing_variant -; then 
+    if doing_variant -; then
       #required="$required $(get_debs Priority: important)"
       #  ^^ should be getting debconf here somehow maybe
       base="$(get_debs Priority: important)"
@@ -123,7 +123,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
@@ -139,7 +139,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     setup_dselect_method apt
 
-    smallyes '' | 
+    smallyes '' |
       (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
       dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
@@ -149,7 +149,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 483e992..3af06de 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -23,7 +23,7 @@ esac
 work_out_debs () {
     required="$(get_debs Priority: required)"
 
-    if doing_variant -; then 
+    if doing_variant -; then
       #required="$required $(get_debs Priority: important)"
       #  ^^ should be getting debconf here somehow maybe
       base="$(get_debs Priority: important)"
@@ -117,7 +117,7 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
     fi
 
-    if doing_variant fakechroot; then 
+    if doing_variant fakechroot; then
 	install_fakechroot_tools
     fi
 
@@ -141,7 +141,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
@@ -162,7 +162,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     setup_dselect_method apt
 
-    smallyes '' | 
+    smallyes '' |
       (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
       dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
@@ -172,7 +172,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index 0b98170..30e20d5 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -23,7 +23,7 @@ esac
 work_out_debs () {
     required="$(get_debs Priority: required)"
 
-    if doing_variant -; then 
+    if doing_variant -; then
       #required="$required $(get_debs Priority: important)"
       #  ^^ should be getting debconf here somehow maybe
       base="$(get_debs Priority: important)"
@@ -117,7 +117,7 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
     fi
 
-    if doing_variant fakechroot; then 
+    if doing_variant fakechroot; then
 	install_fakechroot_tools
     fi
 
@@ -141,7 +141,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
@@ -165,7 +165,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     setup_dselect_method apt
 
-    smallyes '' | 
+    smallyes '' |
       (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
       dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
@@ -175,7 +175,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index ba2a3f8..9c0a8b6 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -33,7 +33,7 @@ esac
 work_out_debs () {
     required="$(get_debs Priority: required)"
 
-    if doing_variant -; then 
+    if doing_variant -; then
       #required="$required $(get_debs Priority: important)"
       #  ^^ should be getting debconf here somehow maybe
       base="$(get_debs Priority: important)"
@@ -117,7 +117,7 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
     fi
 
-    if doing_variant fakechroot; then 
+    if doing_variant fakechroot; then
 	install_fakechroot_tools
     fi
 
@@ -141,7 +141,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
@@ -171,7 +171,7 @@ echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
 
     setup_dselect_method apt
 
-    smallyes '' | 
+    smallyes '' |
       (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
       dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
@@ -194,7 +194,7 @@ echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
       done_predeps="$done_predeps $predep"
     done
 
-    smallyes '' | 
+    smallyes '' |
       (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
diff --git a/scripts/ubuntu/hoary.buildd b/scripts/ubuntu/hoary.buildd
index afb0904..8d10d80 100644
--- a/scripts/ubuntu/hoary.buildd
+++ b/scripts/ubuntu/hoary.buildd
@@ -141,7 +141,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTCORE "Installing core packages" #29 
+    p 10; progress $baseprog $bases INSTCORE "Installing core packages" #29
 
     info INSTCORE "Installing base packages..."
 
diff --git a/scripts/ubuntu/warty.buildd b/scripts/ubuntu/warty.buildd
index 165377e..09c5467 100644
--- a/scripts/ubuntu/warty.buildd
+++ b/scripts/ubuntu/warty.buildd
@@ -141,7 +141,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #19
     smallyes '' | in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --configure --pending --force-configure-any --force-depends
-    p 10; progress $baseprog $bases INSTCORE "Installing core packages" #29 
+    p 10; progress $baseprog $bases INSTCORE "Installing core packages" #29
 
     info INSTCORE "Installing base packages..."