summaryrefslogtreecommitdiff
path: root/libremkchroot
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-03-11 23:56:59 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-10-20 11:53:22 -0400
commitac5ec444b089a1242650c29b9ef6dad1c5b182ec (patch)
tree1c4126c4b9c26d0c39ca5d915be920ac2558737c /libremkchroot
parentf49a63724e56c11c5ee89561f573fff1b1d56506 (diff)
Use arrays to better handle whitepsace in libremkchroot
Diffstat (limited to 'libremkchroot')
-rwxr-xr-xlibremkchroot13
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