From ac5ec444b089a1242650c29b9ef6dad1c5b182ec Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 11 Mar 2012 23:56:59 -0400
Subject: Use arrays to better handle whitepsace in libremkchroot

---
 libremkchroot | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'libremkchroot')

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
-- 
cgit v1.2.3-2-g168b


From e9bc885c355babf7851de31db8e1920dde752993 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 7 Nov 2012 00:17:08 -0500
Subject: organize the files

---
 libremkchroot | 64 -----------------------------------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100755 libremkchroot

(limited to 'libremkchroot')

diff --git a/libremkchroot b/libremkchroot
deleted file mode 100755
index b576209..0000000
--- a/libremkchroot
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# LibreMkChroot
-# Creates a chroot
-
-# Copyright 2011, 2012 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/>.
-
-source /etc/libretools.conf
-
-if [ -e "$XDG_CONFIG_HOME/libretools/libretools.conf" ]; then
-    source "$XDG_CONFIG_HOME/libretools/libretools.conf"
-fi
-
-cmd=${0##*/}
-function usage {
-	echo "Usage: $cmd [OPTIONS]"
-	echo 'This script will create a chroot to build packages in.'
-	echo "Use \`librechroot' to interact with the chroot after it is created."
-	echo ''
-	echo 'Options:'
-	echo ' -h              Show this message'
-	echo ''
-	echo ' -f              Force overwrite of files in the working-dir'
-	echo ''
-	echo ' -d <chrootdir>  Use this dir instead of "$CHROOTDIR".'
-	echo " -c <pacmandir>  Location of pacman cache. Default: \`/var/cache/pacman/pkg'."
-	echo ' -C <file>       Location of pacman config file.'
-	echo ' -M <file>       Location of makepkg config file.'
-}
-
-mkchroot_args=();
-while getopts 'hfd:c:C:M:' arg; do
-	case "$arg" in
-		h) usage; exit 0 ;;
-		f) mkchroot_args+=("-$arg");;
-		c|C|M) mkchroot_args+=("-$arg" "$OPTARG");;
-		d) CHROOTDIR=$OPTARG ;;
-		?) usage; exit 1 ;;
-	esac
-done
-
-if (( EUID )); then
-	error "This script must be run as root"
-	exit 1
-fi
-
-mkdir -p "${CHROOTDIR}"
-xargs -d'\n' mkarchroot "${mkchroot_args[@]}" "${CHROOTDIR}/root" < /etc/libretools.d/cleansystem
-- 
cgit v1.2.3-2-g168b