From 84f3e5e706c32d4686b1fc79628498b37cbf4b02 Mon Sep 17 00:00:00 2001
From: hayao <hayao@fascode.net>
Date: Sat, 8 Jan 2022 01:39:31 +0900
Subject: mkparabolaiso: Fix mmd-command check

valication_error variable is not changed when mmd and/or mcopy are missing.
---
 parabolaiso/mkparabolaiso | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'parabolaiso/mkparabolaiso')

diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index c29e374..08349e3 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -275,24 +275,23 @@ _run_once() {
 # Helper function to run commands for the i686 and x86_64 architectures.
 # $@: commands to run in both architectures
 _run_dual() {
+    local architectures="${arch}"
+    local arch
     local cmd
-    if [[ "${arch}" == "dual" ]]; then
-        local arch
-        for arch in i686 x86_64; do
-            if [[ "${buildmode}" == "bootstrap" ]]; then
-              pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
-            else
-              pacstrap_dir="${work_dir}/${arch}/airootfs"
-            fi
-            for cmd in "$@"; do
-                ${cmd}
-            done
-        done
-    else
+
+    if [[ "${architectures}" == "dual" ]]; then
+        architectures="i686 x86_64"
+    fi
+
+    for arch in ${architectures}; do
+        pacstrap_dir="${work_dir}/${arch}/airootfs"
+        if [[ "${buildmode}" == "bootstrap" ]]; then
+            pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
+        fi
         for cmd in "$@"; do
             ${cmd}
         done
-    fi
+    done
 }
 
 # Set up custom pacman.conf with custom cache and pacman hook directories.
@@ -748,6 +747,7 @@ _validate_common_requirements_bootmode_uefi-x64() {
 
     # Check if mmd and mcopy are available
     if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
+        (( validation_error=validation_error+1 ))
         _msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
     fi
 
@@ -1469,7 +1469,7 @@ _build_iso_base() {
     local run_once_mode="base"
     local buildmode_packages="${packages}"
     if [[ "${arch}" == "dual" ]]; then
-        local buildmode_packages="${packages_dual}"
+        buildmode_packages="${packages_dual}"
         # Set the package list to use for each architecture
         local buildmode_pkg_list_i686=("${pkg_list_i686[@]}")
         local buildmode_pkg_list_x86_64=("${pkg_list_x86_64[@]}")
-- 
cgit v1.2.2