From 5e84ba0d894fbc1755c2508582f84ec2e08f05e3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 26 Aug 2018 16:56:33 -0400
Subject: librechroot clean-pkgs: Do the right thing when libretools is
 installed in the chroot

The /bin/chcleanup file that it installs will clash with the package-owned
/usr/bin/chcleanup (since /bin is a symlink)
---
 src/chroot-tools/librechroot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index 5d1db21..0b0ce0c 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -484,13 +484,13 @@ main() {
 			arch-nspawn "$copydir" pacman -Syu --noconfirm </dev/null
 			;;
 		clean-pkgs)
-			trap "rm -f -- ${copydir@Q}/{bin/chcleanup,chrootexec}" EXIT
-			install -m755 "$(librelib chroot/chcleanup)" "$copydir/bin/chcleanup"
+			trap "rm -f -- ${copydir@Q}/{chcleanup,chrootexec}" EXIT
+			install -m755 "$(librelib chroot/chcleanup)" "$copydir/chcleanup"
 			printf '%s\n' \
 				'#!/bin/bash' \
 				'mkdir -p /startdir' \
 				'cd /startdir' \
-				'/bin/chcleanup' \
+				'/chcleanup' \
 				> "$copydir/chrootexec"
 			chmod 755 "$copydir/chrootexec"
 			arch-nspawn "$copydir" /chrootexec </dev/null
-- 
cgit v1.2.2