[revert] : e68ee3e5037d24a8d0df699091f5fc1f89f95aee

diff --git a/system/mkalteriso.sh b/system/mkalteriso.sh
index 12fcede..3bddc29 100755 (executable)
--- a/system/mkalteriso.sh
+++ b/system/mkalteriso.sh
@@ -57,7 +57,7 @@ cdback() {
 
 _chroot_init() {
     mkdir -p ${work_dir}/airootfs
-
+    
     #_pacman "base base-devel syslinux" <- old code
 
     _pacman "base syslinux"
@@ -319,12 +319,10 @@ command_iso () {
 
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
     if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then
-        _iso_efi_boot_args+=(
-            '-eltorito-alt-boot'
-            '-e' 'EFI/archiso/efiboot.img'
-            '-no-emul-boot'
-            '-isohybrid-gpt-basdat'
-        )
+        _iso_efi_boot_args="-eltorito-alt-boot
+                            -e EFI/archiso/efiboot.img
+                            -no-emul-boot
+                            -isohybrid-gpt-basdat"
     fi
 
     _show_config iso
@@ -332,39 +330,23 @@ command_iso () {
     mkdir -p "${out_dir}"
     _msg_info "Creating ISO image..."
     local _qflag=""
-    if [[ "${quiet}" == "y" ]]; then
-        xorriso -as mkisofs -quiet \
-            -iso-level 3 \
-            -full-iso9660-filenames \
-            -volid "${iso_label}" \
-            -appid "${iso_application}" \
-            -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
-            -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" \
-            "${_iso_efi_boot_args[@]}" \
-            -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
-    else
-        xorriso -as mkisofs \
-            -iso-level 3 \
-            -full-iso9660-filenames \
-            -volid "${iso_label}" \
-            -appid "${iso_application}" \
-            -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
-            -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" \
-            "${_iso_efi_boot_args[@]}" \
-            -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
+    if [[ ${quiet} == "y" ]]; then
+        _qflag="-quiet"
     fi
-
-    
+    xorriso -as mkisofs ${_qflag} \
+        -iso-level 3 \
+        -full-iso9660-filenames \
+        -volid "${iso_label}" \
+        -appid "${iso_application}" \
+        -publisher "${iso_publisher}" \
+        -preparer "prepared by mkalteriso" \
+        -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 \
+        ${_iso_efi_boot_args} \
+        -output "${out_dir}/${img_name}" \
+        "${work_dir}/iso/"
     _mkisochecksum
     _msg_info "Done! | $(ls -sh ${out_dir}/${img_name})"
 }