many fixes

1 files changed, 9 insertions, 5 deletions

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index e39b105..d43ea2f 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -51,6 +51,7 @@ sync() {
 	lock_close 8
 }
 
+cmd=${0##*/}
 usage() {
 	echo "Usage: $cmd [OPTIONS] [CHROOT] "
 	echo 'Interacts with a chroot.'
@@ -80,7 +81,7 @@ main() {
 	[[ $CHROOTCOPY != root ]] || CHROOTCOPY=copy
 
 	local mode=enter
-	local archroot_args=()
+	local archroot_args=(-f)
 	local ARG=''
 	while getopts 'l:NCcI:i:nrsuh' arg; do
 		case $arg in
@@ -90,7 +91,7 @@ main() {
 			C) mode=clean_repo;;
 			c) mode=clean_pacman;;
 			I) mode=install_file; ARG=$OPTARG;;
-			I) mode=install_pkg; ARG=$OPTARG;;
+			i) mode=install_pkg; ARG=$OPTARG;;
 			n) mode=noop;;
 			r) mode=run; ARG=$OPTARG;;
 			s) mode=sync;;
@@ -118,7 +119,7 @@ main() {
 
 	# Keep this lock as long as we are running
 	# Note that '9' is the same FD number as in (mk)archroot
-	lock_open_write 9 "$copydir" "Locking chroot copy '$copy'"
+	lock_open_write 9 "$copydir" "Locking chroot copy '$CHROOTCOPY'"
 
 	if [[ ! -d $rootdir ]]; then
 		libremkchroot "$CHROOT"
@@ -139,8 +140,11 @@ main() {
 		clean_pacman)
 			msg "Intelligently cleaning packages"
 			cp -a "$(dirname $0)/chcleanup"   "${copydir}/clean"
-			mkdir -p "$copydir/build"
-			archroot "${archroot_args[@]}" "${copydir}" -r "cd /build; /clean"
+			echo '#!/bin/bash'        > "${copydir}/cleanstrap"
+			echo 'mkdir /build'      >> "${copydir}/cleanstrap"
+			echo 'cd /build; /clean' >> "${copydir}/cleanstrap"
+			chmod 755 "${copydir}/cleanstrap"
+			archroot "${archroot_args[@]}" "${copydir}" -r /cleanstrap
 			;;
 		install_file)
 			msg "Installing package file: $ARG"