[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. bf58b9271b7e4ddd2dcc6ccb43cad9b9e2d4c2be
Steffen Moeller
moeller at debian.org
Sat Sep 19 14:07:33 UTC 2009
The following commit has been merged in the master branch:
commit 7cf0cc1ec60edb2b39414163cc8f8c146df16dfd
Author: Steffen Moeller <moeller at debian.org>
Date: Sat Sep 19 15:24:16 2009 +0200
Adding quotes around "$INST_DIR"
diff --git a/install.sh b/install.sh
index 22b8d8f..db46584 100755
--- a/install.sh
+++ b/install.sh
@@ -950,13 +950,13 @@ __END__
chroot "$INST_DIR" apt-get update
echo " * Installing pkg-fso keyring"
- chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
+ chroot "$INST_DIR" apt-get $APT_OPTIONS install pkg-fso-keyring
echo " * Completing install of Debian basic packages to circumvent bug #542955"
# dropbear at least cannot be installed without preventing the restart to happen
- mv $INST_DIR/usr/sbin/invoke-rc.d "$INST_DIR"/usr/sbin/invoke-rc.d.diverted
+ mv "$INST_DIR"/usr/sbin/invoke-rc.d "$INST_DIR"/usr/sbin/invoke-rc.d.diverted
cat > "$INST_DIR"/usr/sbin/invoke-rc.d <<EOINVOKERCD
#!/bin/sh
echo "I: ignoring call to invoke-rc.d '$*'
@@ -966,7 +966,7 @@ EOINVOKERCD
chroot "$INST_DIR" apt-get $APT_OPTIONS install $(echo $DEBIAN_EXTRA_PACKAGES | tr "," " ")
echo " * Cleaning APT cache"
- chroot $INST_DIR apt-get clean
+ chroot "$INST_DIR" apt-get clean
echo "I: APT configured"
}
@@ -1495,10 +1495,10 @@ action_cleanup () {
echo "Cleaning the environment"
echo " * Remove additional packages"
- chroot $INST_DIR apt-get --yes --purge remove cdebootstrap-helper-rc.d xserver-xorg-input-synaptics
+ chroot "$INST_DIR" apt-get --yes --purge remove cdebootstrap-helper-rc.d xserver-xorg-input-synaptics
echo " * Cleaning APT cache"
- chroot $INST_DIR apt-get clean
+ chroot "$INST_DIR" apt-get clean
echo "I: the environment is now clean!"
}
--
Various non-packaged files
More information about the pkg-fso-commits
mailing list