diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-20 12:17:20 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-20 12:17:20 -0400 |
| commit | 38550a26dc66a8e5dd462da65acaf56119964536 (patch) | |
| tree | 66402ab22ed8b3e01a81bbd456fd8804451f11ad /libremkchroot | |
| parent | b4c8f17a6d97b63589b624d726e10d64cbd743ec (diff) | |
| parent | 5ae7257fca114a6174c070556745a40fe0ca4ff5 (diff) | |
Merge branch 'master' into smart-cleanup
Conflicts:
update-cleansystem
Diffstat (limited to 'libremkchroot')
| -rwxr-xr-x | libremkchroot | 13 |
1 files changed, 5 insertions, 8 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 |