From 8831cc585ae8e9071f8c022bdfaf75e42029d7e4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 25 Mar 2014 21:44:14 -0400
Subject: Fix quoting/escaping with 'rm' in traps.

---
 src/chroot-tools/librechroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/chroot-tools/librechroot')

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index d8e76ac..6be9f09 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -371,7 +371,7 @@ main() {
 			arch-nspawn "$copydir" bash -c 'pacman -Syu --noconfirm'
 			;;
 		clean-pkgs)
-			trap "rm -f '$copydir'/bin/chcleanup '$copydir'/chrootexec" EXIT
+			trap "rm -f -- $(printf '%q ' "$copydir"/{bin/chcleanup,chrootexec})" EXIT
 			install -m755 "$(librelib chroot/chcleanup)" "$copydir/bin/chcleanup"
 			printf '%s\n' \
 				'#!/bin/bash' \
-- 
cgit v1.2.2