From e3b878ce983e5e01960ba5ec5c330749df7dcac4 Mon Sep 17 00:00:00 2001 From: Tatsuki Sugiura Date: Mon, 23 Dec 2013 17:27:22 +0900 Subject: [PATCH] Fix glob expansion for no-cache setting. On previous version, glob pattern will be expanded to actual file names when writing setting to etc/apt/apt.conf.d/no-cache. This patch fixes to quote to work cache clean command properly. --- contrib/mkimage-debootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mkimage-debootstrap.sh b/contrib/mkimage-debootstrap.sh index f9992d6e3c..3f268b52da 100755 --- a/contrib/mkimage-debootstrap.sh +++ b/contrib/mkimage-debootstrap.sh @@ -144,9 +144,9 @@ if [ -z "$strictDebootstrap" ]; then echo 'force-unsafe-io' | sudo tee etc/dpkg/dpkg.cfg.d/02apt-speedup > /dev/null # we want to effectively run "apt-get clean" after every install to keep images small (see output of "apt-get clean -s" for context) { - aptGetClean='rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true' - echo 'DPkg::Post-Invoke { "'$aptGetClean'"; };' - echo 'APT::Update::Post-Invoke { "'$aptGetClean'"; };' + aptGetClean='"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true";' + echo "DPkg::Post-Invoke { ${aptGetClean} };" + echo "APT::Update::Post-Invoke { ${aptGetClean} };" echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' } | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null # and remove the translations, too