From 8d18d8f745b6afae88c896f432b2cfd81c6e134a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 24 Aug 2021 18:57:27 +0300
Subject: mkarchiso: fix unbound variable errors in _validate_options

$pkg_list_from_file and $bootstrap_pkg_list_from_file are arrays, they must be referenced as such. Fixes https://bugs.archlinux.org/task/71852.

Remove quotes from arithmetic expressions.
---
 archiso/mkarchiso | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'archiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index a77d3d9..e2b6674 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -978,7 +978,7 @@ _validate_options() {
     if [[ -e "${packages}" ]]; then
         mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
         pkg_list+=("${pkg_list_from_file[@]}")
-        if (( ${#pkg_list_from_file} < 1 )); then
+        if (( ${#pkg_list_from_file[@]} < 1 )); then
             (( validation_error=validation_error+1 ))
             _msg_error "No package specified in '${packages}'." 0
         fi
@@ -993,7 +993,7 @@ _validate_options() {
             mapfile -t bootstrap_pkg_list_from_file < \
                 <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
             bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
-            if (( ${#bootstrap_pkg_list_from_file} < 1 )); then
+            if (( ${#bootstrap_pkg_list_from_file[@]} < 1 )); then
                 (( validation_error=validation_error+1 ))
                 _msg_error "No package specified in '${bootstrap_packages}'." 0
             fi
@@ -1014,7 +1014,7 @@ _validate_options() {
         done
         cert_list=("${_override_cert_list[@]}")
         # Check if there are at least two certificate files
-        if (( "${#cert_list[@]}" < 2 )); then
+        if (( ${#cert_list[@]} < 2 )); then
             (( validation_error=validation_error+1 ))
             _msg_error "Two certificates are required for codesigning, but '${cert_list[*]}' is provided." 0
         fi
@@ -1074,7 +1074,7 @@ _validate_options() {
 _set_overrides() {
     # Set variables that have command line overrides
     [[ ! -v override_buildmodes ]] || buildmodes=("${override_buildmodes[@]}")
-    if (( "${#buildmodes[@]}" < 1 )); then
+    if (( ${#buildmodes[@]} < 1 )); then
         buildmodes+=('iso')
     fi
     if [[ -v override_work_dir ]]; then
-- 
cgit v1.2.3-70-g09d2