* Extensive quoting fixes, allowing installation to a target containing

  spaces (closes: #387673).

r48817

16 files changed, 37 insertions, 37 deletions

diff --git a/scripts/debian/potato b/scripts/debian/potato
index f579ee2..52edfc4 100644
--- a/scripts/debian/potato
+++ b/scripts/debian/potato
@@ -42,7 +42,7 @@ first_stage_install () {
         local pkg=$1
         local deb="$(debfor $pkg)"
         local ver="$(
-            ar -p $TARGET/$deb control.tar.gz | zcat |
+            ar -p "$TARGET/$deb" control.tar.gz | zcat |
                 tar -O -xf - control ./control 2>/dev/null |
                 sed -ne 's/^Version: *//Ip' | head -n 1
         )"
diff --git a/scripts/debian/sarge b/scripts/debian/sarge
index e6d77e3..e9f303b 100644
--- a/scripts/debian/sarge
+++ b/scripts/debian/sarge
@@ -151,7 +151,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTBASE "Installing base system" #3
     x_core_install dpkg
@@ -166,7 +166,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTBASE "Installing base system" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTBASE "Installing base system" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTBASE "Installing base system" #7
     x_core_install debconf
diff --git a/scripts/debian/sarge.buildd b/scripts/debian/sarge.buildd
index ead74ca..6dc004e 100644
--- a/scripts/debian/sarge.buildd
+++ b/scripts/debian/sarge.buildd
@@ -112,7 +112,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTBASE "Installing base system" #3
     x_core_install dpkg
@@ -127,7 +127,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTBASE "Installing base system" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTBASE "Installing base system" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTBASE "Installing base system" #7
 
diff --git a/scripts/debian/sarge.fakechroot b/scripts/debian/sarge.fakechroot
index 1001253..82d5229 100644
--- a/scripts/debian/sarge.fakechroot
+++ b/scripts/debian/sarge.fakechroot
@@ -116,7 +116,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTBASE "Installing base system" #3
     x_core_install dpkg
@@ -133,7 +133,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTBASE "Installing base system" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTBASE "Installing base system" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTBASE "Installing base system" #7
 
diff --git a/scripts/debian/sid b/scripts/debian/sid
index 1ffa4f1..85ebd05 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -52,8 +52,8 @@ first_stage_install () {
         chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    if [ -x $TARGET/usr/bin/md5sum.textutils -a \! -e $TARGET/usr/bin/md5sum ]; then
-        cp $TARGET/usr/bin/md5sum.textutils $TARGET/usr/bin/md5sum
+    if [ -x "$TARGET/usr/bin/md5sum.textutils" -a \! -e "$TARGET/usr/bin/md5sum" ]; then
+        cp "$TARGET/usr/bin/md5sum.textutils" "$TARGET/usr/bin/md5sum"
     fi
 
     if doing_variant fakechroot; then 
@@ -111,7 +111,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -131,7 +131,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
diff --git a/scripts/debian/woody b/scripts/debian/woody
index 49da1f8..3bbe28c 100644
--- a/scripts/debian/woody
+++ b/scripts/debian/woody
@@ -136,7 +136,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTBASE "Installing base system" #3
     x_core_install dpkg
@@ -151,7 +151,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTBASE "Installing base system" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTBASE "Installing base system" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTBASE "Installing base system" #7
     x_core_install debconf
diff --git a/scripts/debian/woody.buildd b/scripts/debian/woody.buildd
index 21867de..c8432e9 100644
--- a/scripts/debian/woody.buildd
+++ b/scripts/debian/woody.buildd
@@ -112,7 +112,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTBASE "Installing base system" #3
     x_core_install dpkg
@@ -127,7 +127,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTBASE "Installing base system" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTBASE "Installing base system" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTBASE "Installing base system" #7
 
diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy
index 8b55993..71d8a53 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/ubuntu/breezy
@@ -89,7 +89,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -105,7 +105,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper
index 63e8582..18d19aa 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/ubuntu/dapper
@@ -96,7 +96,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -112,7 +112,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 53e82ec..efdc146 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -110,7 +110,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -130,7 +130,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
@@ -152,7 +152,7 @@ second_stage_install () {
 
     if doing_variant fakechroot; then
 	# fix initscripts postinst (no mounting possible, and wrong if condition)
-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
     fi
 
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index 894a5e3..b317c68 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -110,7 +110,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -130,7 +130,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
@@ -152,10 +152,10 @@ second_stage_install () {
 
     if doing_variant fakechroot; then
 	# fix initscripts postinst (no mounting possible, and wrong if condition)
-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
 
 	# kill libdevmapper postinst; it tries to create /dev/mapper/
-	rm $TARGET/var/lib/dpkg/info/libdevmapper1*.postinst
+	rm "$TARGET/var/lib/dpkg/info/libdevmapper1"*.postinst
     fi
 
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index c934440..4353812 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -100,7 +100,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -120,7 +120,7 @@ second_stage_install () {
     x_core_install perl-base
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
@@ -142,7 +142,7 @@ second_stage_install () {
 
     if doing_variant fakechroot; then
 	# fix initscripts postinst (no mounting possible, and wrong if condition)
-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
     fi
 
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
diff --git a/scripts/ubuntu/hoary b/scripts/ubuntu/hoary
index 5450dc5..4f94783 100644
--- a/scripts/ubuntu/hoary
+++ b/scripts/ubuntu/hoary
@@ -109,7 +109,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -124,7 +124,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTCORE "Installing core packages" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
     x_core_install debconf
diff --git a/scripts/ubuntu/hoary.buildd b/scripts/ubuntu/hoary.buildd
index f987e2f..def2f40 100644
--- a/scripts/ubuntu/hoary.buildd
+++ b/scripts/ubuntu/hoary.buildd
@@ -105,7 +105,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -120,7 +120,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTCORE "Installing core packages" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
 
diff --git a/scripts/ubuntu/warty b/scripts/ubuntu/warty
index 8771d37..481a49a 100644
--- a/scripts/ubuntu/warty
+++ b/scripts/ubuntu/warty
@@ -100,7 +100,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -115,7 +115,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTCORE "Installing core packages" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7
     x_core_install debconf
diff --git a/scripts/ubuntu/warty.buildd b/scripts/ubuntu/warty.buildd
index a5ab9c5..f989242 100644
--- a/scripts/ubuntu/warty.buildd
+++ b/scripts/ubuntu/warty.buildd
@@ -105,7 +105,7 @@ second_stage_install () {
     info INSTCORE "Installing core packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
+    ln -sf mawk "$TARGET/usr/bin/awk"
     x_core_install base-files base-passwd
     p; progress $baseprog $bases INSTCORE "Installing core packages" #3
     x_core_install dpkg
@@ -120,7 +120,7 @@ second_stage_install () {
     p; progress $baseprog $bases INSTCORE "Installing core packages" #5
     x_core_install perl-base
     p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
+    rm "$TARGET/usr/bin/awk"
     x_core_install mawk
     p; progress $baseprog $bases INSTCORE "Installing core packages" #7