[fix] : Fixed shellcheck error

Author: Hayao0819

tools/allpkglist.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -eu
 
 load_config() {
     local _file
@@ -30,6 +30,7 @@ out_dir=""
 archs=("x86_64" "i686" "i486")
 stdout=false
 include_aur=false
+pkglist=()
 
 # Parse options
 OPTS="a:o:hs"
@@ -43,7 +44,7 @@ unset OPT OPTS OPTL
 while true; do
     case "${1}" in
         -a | --arch)
-            archs=(${2})
+            IFS=" " read -ra archs <<< "${2}"
             shift 2
             ;;
         -o | --out)
@@ -80,63 +81,42 @@ fi
 load_config() {
     local _file
     for _file in "${@}"; do
-        if [[ -f "${_file}" ]]; then
-            source "${_file}"
-        fi
-    done
-}
-
-for_module(){
-    local module
-    for module in "${modules[@]}"; do
-        eval $(echo "${@}" | sed "s|{}|${module}|g")
+        [[ -f "${_file}" ]] && source "${_file}"
     done
+    return 0
 }
 
 for arch in "${archs[@]}"; do
     for channel in $("${tools_dir}/channel.sh" show -a "${arch}" -b -d -k zen -f); do
-        modules=($(
+        readarray -t modules < <(
             load_config "${script_path}/default.conf" "${script_path}/custom.conf"
-            load_config "${channel_dir}/config.any" "${channel_dir}/config.${arch}"
-            if [[ ! -z "${include_extra+SET}" ]]; then
+            load_config "${channel}/config.any" "${channel}/config.${arch}"
+            if [[ -n "${include_extra+SET}" ]]; then
                 if [[ "${include_extra}" = true ]]; then
-                    modules=("share" "share-extra")
+                    modules=("base" "share" "share-extra" "calamares" "zsh-powerline")
                 else
-                    modules=("share")
+                    modules=("base" "share")
                 fi
             fi
-            for module in "${modules[@]}"; do
-                dependent="${module_dir}/${module}/dependent"
-                if [[ -f "${dependent}" ]]; then
-                    modules+=($(grep -h -v ^'#' "${dependent}" | tr -d "\n" ))
-                fi
-            done
-            unset module dependent
-            modules=($(printf "%s\n" "${modules[@]}" | sort | uniq))
-            for_module load_config "${module_dir}/{}/config.any" "${module_dir}/{}/config.${arch}"
-            echo "${modules[@]}"
-        ))
+            printf "%s\n" "${modules[@]}"
+        )
 
-        pkglist_opts="-a ${arch} -b -c ${channel%/} -k zen -l en --line ${modules[*]}"
+        pkglist_opts=(-a "${arch}" -b -c "${channel}" -k zen -l en --line "${modules[@]}")
 
         if [[ "${stdout}" = true ]]; then
-            pkglist+=($("${tools_dir}/pkglist.sh" ${pkglist_opts}))
-            if [[ "${include_aur}" = true ]]; then
-                pkglist+=($("${tools_dir}/pkglist.sh" --aur ${pkglist_opts}))
-            fi
+            readarray -O "${#pkglist[@]}" -t pkglist < <("${tools_dir}/pkglist.sh" "${pkglist_opts[@]}")
+            [[ "${include_aur}" = true ]] && readarray -O "${#pkglist[@]}" -t pkglist < <("${tools_dir}/pkglist.sh" --aur "${pkglist_opts[@]}") || true
         else
             (
-                "${tools_dir}/pkglist.sh" -d ${pkglist_opts}
-                if [[ "${include_aur}" = true ]]; then
-                    "${tools_dir}/pkglist.sh" --aur -d ${pkglist_opts}
-                fi
+                "${tools_dir}/pkglist.sh" -d "${pkglist_opts[@]}"
+                [[ "${include_aur}" = true ]] && "${tools_dir}/pkglist.sh" --aur -d "${pkglist_opts[@]}" || true
             ) 1> "${out_dir}/$(basename "${channel}").${arch}"
         fi
 
     done
 done
 
 if [[ "${stdout}" = true ]]; then
-    pkglist=($(printf "%s\n" "${pkglist[@]}" | sort |uniq))
+    readarray -t pkglist < <(printf "%s\n" "${pkglist[@]}" | sort |uniq)
     printf "%s\n" "${pkglist[@]}"
 fi