From 626705238075a1aceca518e4d464b5df6458750f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 5 Jul 2014 02:36:52 -0400
Subject: quote calls to librelib

---
 src/chroot-tools/arch-nspawn.patch |  2 +-
 src/chroot-tools/hooks-distcc.sh   |  2 +-
 src/chroot-tools/librechroot       |  8 ++++----
 src/chroot-tools/libremakepkg      | 12 ++++++------
 src/chroot-tools/mkarchroot.patch  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/chroot-tools')

diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
index 5e0f10b..792b99f 100644
--- a/src/chroot-tools/arch-nspawn.patch
+++ b/src/chroot-tools/arch-nspawn.patch
@@ -12,7 +12,7 @@
  fi
  
 -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-+CHROOTARCH="$(. $(librelib conf); get_var chroot CHROOTARCH "$CARCH")"
++CHROOTARCH="$(. "$(librelib conf)"; get_var chroot CHROOTARCH "$CARCH")"
 +exec ${CHROOTARCH:+setarch "$CHROOTARCH"} systemd-nspawn -q \
  	-D "$working_dir" \
  	--machine "$machine_name" \
diff --git a/src/chroot-tools/hooks-distcc.sh b/src/chroot-tools/hooks-distcc.sh
index 37c82dc..bb234b8 100644
--- a/src/chroot-tools/hooks-distcc.sh
+++ b/src/chroot-tools/hooks-distcc.sh
@@ -62,7 +62,7 @@ distcc_start() {
 
 		_distcc_check
 
-		local _distcc_tool=$(librelib chroot/distcc-tool)
+		local _distcc_tool="$(librelib chroot/distcc-tool)"
 		install -m755 "$_distcc_tool"  "$copydir/bin/distcc-tool"
 
 		mkdir -p "$home/.ssh"
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index 4edcb2f..1eba63c 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -30,7 +30,7 @@ set -euE
 #   - the case statement in main() that checks the number of arguments
 #   - the case statement in main() that runs them
 
-. $(librelib conf)
+. "$(librelib conf)"
 load_files chroot
 
 . libremessages
@@ -38,9 +38,9 @@ load_files chroot
 shopt -s nullglob
 umask 0022
 
-readonly _arch_nspawn=$(librelib chroot/arch-nspawn)
-readonly _mkarchroot=$(librelib chroot/mkarchroot)
-readonly _makechrootpkg=$(librelib chroot/makechrootpkg.sh)
+readonly _arch_nspawn="$(librelib chroot/arch-nspawn)"
+readonly _mkarchroot="$(librelib chroot/mkarchroot)"
+readonly _makechrootpkg="$(librelib chroot/makechrootpkg.sh)"
 
 # Because the makechrootpkg.sh library functions don't work with -euE
 _makechrootpkg() (
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index aad4217..1512282 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -24,9 +24,9 @@ set -euE
 # You should have received a copy of the GNU General Public License
 # along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
-. $(librelib conf)
-. $(librelib messages)
-. $(librelib chroot/makechrootpkg.sh)
+. "$(librelib conf)"
+. "$(librelib messages)"
+. "$(librelib chroot/makechrootpkg.sh)"
 
 set -o pipefail
 shopt -s nullglob
@@ -47,9 +47,9 @@ hook_pre_build=(:)
 hook_post_build=(:)
 hook_check_pkgbuild=(:)
 hook_check_pkg=(:)
-. $(librelib chroot/hooks-chcleanup.sh)
-. $(librelib chroot/hooks-check.sh)
-. $(librelib chroot/hooks-distcc.sh)
+. "$(librelib chroot/hooks-chcleanup.sh)"
+. "$(librelib chroot/hooks-check.sh)"
+. "$(librelib chroot/hooks-distcc.sh)"
 
 # Boring/mundane functions #####################################################
 
diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch
index 9366d92..3c8137c 100644
--- a/src/chroot-tools/mkarchroot.patch
+++ b/src/chroot-tools/mkarchroot.patch
@@ -24,7 +24,7 @@
  echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
  
 -exec arch-nspawn \
-+exec $(librelib chroot/arch-nspawn) \
++exec "$(librelib chroot/arch-nspawn)" \
  	${pac_conf:+-C "$pac_conf"} \
  	${makepkg_conf:+-M "$makepkg_conf"} \
  	${cache_dir:+-c "$cache_dir"} \
-- 
cgit v1.2.2