make double-quoting paths consistent

2 files changed, 22 insertions, 13 deletions

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 266f940..14f4606 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -58,13 +58,13 @@ make_pacman_conf() {
 
 # Base installation, plus needed packages (root-image)
 make_basefs() {
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} init
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -p "memtest86+ mkinitcpio-nfs-utils nbd" install
 }
 
 # Additional packages (root-image)
 make_packages() {
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${releng_dir}/packages.{both,${arch}})" install
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -p "$(grep -h -v ^# ${releng_dir}/packages.{both,${arch}})" install
 }
 
 # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
@@ -77,14 +77,17 @@ make_setup_mkinitcpio() {
     cp ${initcpio_dir}/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
     cp ${initcpio_dir}/hooks/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio
     cp ${releng_dir}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
 }
 
 # Customize installation (root-image)
 make_customize_root_image() {
     cp -af ${releng_dir}/root-image ${work_dir}/${arch}
 
-    iso_version="${iso_version}" setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run
+    iso_version="${iso_version}" setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch}                 \
+                                                                          -C ${pacman_conf}                      \
+                                                                          -D ${install_dir}                      \
+                                                                          -r '/root/customize_root_image.sh' run
     rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh
 }
 
@@ -202,16 +205,16 @@ make_aitab() {
 # Build all filesystem images specified in aitab (.fs.sfs .sfs)
 make_prepare() {
     cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
-    setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} pkglist
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} prepare
     rm -rf ${work_dir}/root-image
     # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
 }
 
 # Build ISO
 make_iso() {
-    mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
-    mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
+    mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} checksum
+    mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} -L ${iso_label} -o ${out_dir} iso ${iso_name}
 }
 
 if [[ ${EUID} -ne 0 ]]; then
@@ -241,6 +244,12 @@ while getopts 'N:V:L:D:w:o:vh' arg; do
     esac
 done
 
+iso_label=${iso_label// /}
+install_dirname=${install_dirname// /}
+work_dir=${work_dir// /}
+out_dir=${out_dir// /}
+pacman_conf=${pacman_conf// /}
+
 
 chown -R 0:0 "${releng_dir}/root-image/"
 mkdir -p ${work_dir}
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index fd6fae5..7e70554 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -72,8 +72,8 @@ _chroot_umount () {
 }
 
 _chroot_init() {
-    if [[ ! -d ${work_dir}/root-image/var/cache/pacman ]]; then
-        mkdir -p ${work_dir}/root-image/{dev,proc,run,sys,tmp,var/lib/pacman}
+    if [[ ! -d "${work_dir}/root-image/var/cache/pacman" ]]; then
+        mkdir -p "${work_dir}"/root-image/{dev,proc,run,sys,tmp,var/lib/pacman}
         _pacman "base"
         _pacman "syslinux"
     fi
@@ -81,7 +81,7 @@ _chroot_init() {
 
 _chroot_run() {
     _chroot_mount
-    eval chroot ${work_dir}/root-image "${run_cmd}"
+    eval chroot "${work_dir}/root-image" "${run_cmd}"
     _chroot_umount
 }
 
@@ -442,7 +442,7 @@ command_iso () {
             -eltorito-boot isolinux/isolinux.bin \
             -eltorito-catalog isolinux/boot.cat \
             -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \
+            -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
             ${_iso_efi_boot_args} \
             -output "${out_dir}/${img_name}" \
             "${work_dir}/iso/"