Merge branch 'master' into smart-cleanup

Conflicts:
	update-cleansystem

2 files changed, 52 insertions, 19 deletions

diff --git a/libremkchroot b/libremkchroot
index c1f2072..b576209 100755
--- a/libremkchroot
+++ b/libremkchroot
@@ -2,7 +2,7 @@
 # LibreMkChroot
 # Creates a chroot
 
-# Copyright 2011 Luke Shumaker
+# Copyright 2011, 2012 Luke Shumaker
 
 # ---------- GNU General Public License 3 ----------
 
@@ -27,10 +27,7 @@ if [ -e "$XDG_CONFIG_HOME/libretools/libretools.conf" ]; then
     source "$XDG_CONFIG_HOME/libretools/libretools.conf"
 fi
 
-#CHROOTNAME="${CHROOT:-${SUDO_USER:-root}}"
-
 cmd=${0##*/}
-
 function usage {
 	echo "Usage: $cmd [OPTIONS]"
 	echo 'This script will create a chroot to build packages in.'
@@ -47,12 +44,12 @@ function usage {
 	echo ' -M <file>       Location of makepkg config file.'
 }
 
-mkchroot_args='';
+mkchroot_args=();
 while getopts 'hfd:c:C:M:' arg; do
 	case "$arg" in
 		h) usage; exit 0 ;;
-		f) mkchroot_args="$mkchroot_args -$arg" ;;
-		c|C|M) mkchroot_args="$mkchroot_args -$arg $OPTARG" ;;
+		f) mkchroot_args+=("-$arg");;
+		c|C|M) mkchroot_args+=("-$arg" "$OPTARG");;
 		d) CHROOTDIR=$OPTARG ;;
 		?) usage; exit 1 ;;
 	esac
@@ -64,4 +61,4 @@ if (( EUID )); then
 fi
 
 mkdir -p "${CHROOTDIR}"
-xargs -d'\n' mkarchroot $mkchroot_args "${CHROOTDIR}/root" < /etc/libretools.d/cleansystem
+xargs -d'\n' mkarchroot "${mkchroot_args[@]}" "${CHROOTDIR}/root" < /etc/libretools.d/cleansystem
diff --git a/update-cleansystem b/update-cleansystem
index 98eb0dc..7c652ab 100755
--- a/update-cleansystem
+++ b/update-cleansystem
@@ -1,18 +1,57 @@
 #!/bin/bash
 # Updates the cleansystem file
-# Creates a fake Parabola root and prints all packages installable from base
-# and base-devel plus extras
+# Creates a fake Parabola root and writes to cleansystem all
+# packages installable from base and base-devel plus extras.
+
+# Copyright 2012 Nicolás Reynolds, Luke Shumaker
+
+# ---------- GNU General Public License 3 ----------
+
+# This file is part of Parabola.
+
+# Parabola is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Parabola is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
 set -e
 
-if [ ! -w / ]; then
-    echo "Run as root."
-    exit 1
+# libretools.conf gives us libremessages
+source /etc/libretools.conf
+
+cleansystem=/etc/libretools.d/cleansystem
+
+cmd=${0##*/}
+usage() {
+	echo "Usage: $cmd [<EXTRA_PACKAGES>]"
+	echo "       $cmd -h"
+	echo "Creates a fake Parabola root and writes to \`$cleansystem' all"
+	echo "packages installable from base and base-devel plus extras."
+	echo ''
+	echo 'Options:'
+	echo ' -h              Show this message'
+}
+
+if [ "$1" == '-h' ]; then
+	usage
+	exit 0
+fi
+
+if [ ! -w "$cleansystem" ]; then
+	error 'This script must be run as root'
+	exit 1
 fi
 
 # Maintain a clean database in the system
 db_dir="${DB:-/var/lib/libretools/clean}"
-
 [ ! -d "${db_dir}" ] && mkdir -p "${db_dir}"
 
 # We sync first because updating info gets printed to stdout too
@@ -20,8 +59,5 @@ pacman -b "${db_dir}" --config /etc/pacman.conf -Sy 2>/dev/null
 pacman -b "${db_dir}" \
        --config /etc/pacman.conf \
        -Sp --print-format "%n" \
-       base base-devel sudo ${@} | sort > /etc/libretools.d/cleansystem
-
-pacman -Sy --needed --noconfirm base base-devel sudo $@
-
-exit $?
+       base base-devel sudo "$@" | sort > "$cleansystem"
+pacman -Sy --needed --noconfirm base base-devel sudo "$@"