chroot-tools: clean up, make play nice with new devtools

 * buildenv: delete; this is done by `mkarchroot`
 * librechroot:
     - adopt `archbuild`'s concept of CHROOT and CHROOTCOPY
     - add `-l` option to set the CHROOTCOPY
 * libremakepkg:
     - adopt `archbuild`'s concept of CHROOT and CHROOTCOPY
     - add `-l` option to set the CHROOTCOPY
     - pass options to `makechrootpkg` and `makepkg` the way `-h` always
       said it did
 * libremkchroot:
     - adopt `archbuild`'s concept of CHROOT and CHROOTCOPY
     - remove `-c` option to set the pacman cache
     - remove `-f` option to force overwrite

1 files changed, 87 insertions, 73 deletions

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index c8e02b0..d53448a 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -4,6 +4,7 @@
 
 # Copyright 2010 Nicolás Reynolds
 # Copyright 2011 Joshua Haase
+# Copyright 2012 Luke Shumaker
 
 # ---------- GNU General Public License 3 ----------
 
@@ -22,87 +23,100 @@
 # You should have received a copy of the GNU General Public License
 # along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
-function usage {
-
-    echo ""
-    echo "Usage: $0 [options] [chrootname]"
-    echo "Use it as root."
-    echo ""
-    echo "Default chroot name: $CHROOT"
-    echo "Default chrootdir: $CHROOTDIR"
-    echo ""
-    echo "OPTIONS:"
-    echo ""
-    echo " -c : clean the chroot using pacman"
-    echo "      only 'base', 'base-devel' and 'sudo' on chroot"
-    echo " -d <chrootdir> : use <chrootdir> instead of default"
-    echo " -r : clean /repo on the chroot"
-    echo " -h : this message"
-    echo " -u : update the chroot"
-    echo ""
+. /etc/libretools.conf
 
-}
+cmd=${0##*/}
 
-function clean_chroot {  # Clean packages with pacman
-    cp -a "$(dirname $0)/chcleanup" "${CHROOTDIR}/${CHROOTNAME}/clean"
+clean_chroot() {  # Clean packages with pacman
+	msg "Cleaning chroot with pacman: ${chroot_path}"
 
-    mkarchroot -r "cd /build; /clean" "${CHROOTDIR}/${CHROOTNAME}"
-}
+	cp -a "$(dirname $0)/chcleanup"   "${chroot_path}/clean"
+	mkarchroot -r "cd /build; /clean" "${chroot_path}"
 
-function clean_repo {
-    msg "Cleaning repo for chroot: ${CHROOTDIR}/${CHROOTNAME}"
-    if [ -d "${CHROOTDIR}/${CHROOTNAME}/repo" ]; then
-        find "${CHROOTDIR}/${CHROOTNAME}/repo/" -mindepth 1 -delete
-    else
-        mkdir -p "${CHROOTDIR}/${CHROOTNAME}/repo"
-    fi
-    bsdtar -czf "${CHROOTDIR}/${CHROOTNAME}/repo/repo.db.tar.gz" -T /dev/null
-    ln -s "repo.db.tar.gz" "${CHROOTDIR}/${CHROOTNAME}/repo/repo.db"
+	#mkarchroot "${chroot_path}" base base-devel sudo "${CHROOTEXTRAPKG[@]}"
 }
-source /etc/libretools.conf
-
-if [ -e "$XDG_CONFIG_HOME/libretools/libretools.conf" ]; then
-    source "$XDG_CONFIG_HOME/libretools/libretools.conf"
-fi
-
-CLEANCHROOT='false'
-UPDATE='false'
-CLEANREPO='false'
-CHROOTNAME="${CHROOT:-${SUDO_USER:-root}}"
-
-while getopts 'hrcud:' arg; do
-    case $arg in
-        h) usage; exit 0 ;;
-        c) CLEANCHROOT='true' ;;
-        u) UPDATE='true' ;;
-        r) CLEANREPO='true' ;;
-        d) CHROOTDIR="$(readlink -e $OPTARG)" ;;
-    esac
-done
-
-[[ "$UID" != "0" ]] && {
-    error "This script must be run as root."
-    exit 1
+
+clean_repo() {
+	msg "Cleaning repo for chroot: ${chroot_path}"
+
+	if [ -d  "${chroot_path}/repo" ]; then
+		find "${chroot_path}/repo/" -mindepth 1 -delete
+	else
+		mkdir -p "${chroot_path}/repo"
+	fi
+	bsdtar -czf "${chroot_path}/repo/repo.db.tar.gz" -T /dev/null
+	ln -s "repo.db.tar.gz" "${chroot_path}/repo/repo.db"
 }
 
-shift $(($OPTIND - 1))
+update() {
+	msg "Updating chroot: ${chroot_path}"
+	mkarchroot -u "${chroot_path}"
+}
 
-if [ $# -eq 1 ]; then
-    CHROOTNAME="$1"
-fi
+enter() {
+	msg "Entering chroot: ${chroot_path}"
+	mkarchroot -r "bash" "${chroot_path}"
+}
 
-if "$CLEANREPO"; then
-    clean_repo
-fi
+usage() {
+	echo "Usage: $cmd [OPTIONS] [CHROOT]"
+	echo 'Interacts with a chroot.'
+	echo ''
+	echo "The default CHROOT is \`${CHROOT}'."
+	echo ''
+	echo 'Options:'
+	echo ' Settings:'
+	echo " -d <CHROOTDIR>  Use this dir instead of \`${CHROOTDIR}'"
+	echo ' -l <copy>       Use this as the chroot copy instead of basing it'
+	echo '                 on the username'
+	echo ' Modes:'
+	echo ' -h              Show this message'
+	echo ' -c              Clean the chroot using pacman'
+	echo ' -r              Clean /repo in the chroot'
+	echo ' -u              Update the chroot'
+}
 
-if "$CLEANCHROOT"; then
-    clean_chroot
-elif "$UPDATE"; then
-    msg "Updating chroot: ${CHROOTDIR}/${CHROOTNAME}"
-    mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"
-else
-    msg "Entering chroot: ${CHROOTDIR}/${CHROOTNAME}"
-    mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"
-fi
+main() {
+	# The logic for setting CHROOTCOPY is mirred from makechrootpkg
+	CHROOTCOPY=$USER
+	[[ -n $SUDO_USER ]] && CHROOTCOPY=$SUDO_USER
+	[[ -z $CHROOTCOPY || $CHROOTCOPY = root ]] && CHROOTCOPY=copy
+
+	local mode=enter
+	while getopts 'hrcud:l:' arg; do
+		case $arg in
+			d) CHROOTDIR=$OPTARG;;
+			l) CHROOTCOPY=$OPTARG;;
+
+			c) mode=clean_chroot;;
+			r) mode=clean_repo;;
+			u) mode=update;;
+
+			h) usage; exit 0;;
+			*) usage; exit 1;;
+		esac
+	done
+	shift $(($OPTIND - 1))
+	case $# in
+		0) :;;
+		1) CHROOT="$1";;
+		*) usage; exit 1;;
+	esac
+
+	# not local
+	chroot_path="${CHROOTDIR}/${CHROOT}/${CHROOTCOPY}"
+
+	if (( EUID )); then
+		error "This script must be run as root."
+		exit 1
+	fi
+
+	case "$mode" in
+		clean_chroot) clean_chroot; exit $?;;
+		clean_repo) clean_repo; exit $?;;
+		update) update; exit $?;;
+		enter) enter; exit $?;;
+	esac
+}
 
-exit 0
+main "$@"