From: hayao <shun819.mail@gmail.com>
Date: Thu, 12 Nov 2020 11:55:51 +0000 (+0900)
Subject: [fix] : Fixed variable name
X-Git-Tag: rc3-alpha1~13^2~24^2~3^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b304dcbaaae485e457e57d5e361b69c4bf3b2997;p=alterlinux%2Falterlinux.git

[fix] : Fixed variable name
---

diff --git a/build.sh b/build.sh
index acc21ec1..0158e633 100755
--- a/build.sh
+++ b/build.sh
@@ -664,9 +664,9 @@ make_packages_file() {
 }
 
 make_packages_aur() {
-    local  _pkg  _pkglist
+    local  _pkg pkglist_aur
 
-    _pkglist=($("${script_path}/tools/pkglist.sh" --aur -a "x86_64" -k "${kernel}" -c "${channel_dir}" -l "${locale_name}"))
+    pkglist_aur=($("${script_path}/tools/pkglist.sh" --aur -a "x86_64" -k "${kernel}" -c "${channel_dir}" -l "${locale_name}"))
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
     echo -e "\n\n# AUR packages.\n#\n\n" >> "${work_dir}/packages.list"
@@ -678,15 +678,11 @@ make_packages_aur() {
         chmod 755 "${airootfs_dir}/root/${_file}.sh"
     done
 
-    local _aur_packages_ls_str=""
-    for _pkg in ${pkglist_aur[@]}; do
-        _aur_packages_ls_str="${_aur_packages_ls_str} ${_pkg}"
-    done
-    cp -rf /etc/pacman.d/gnupg/ "${airootfs_dir}/etc/pacman.d/gnupg/"
-    cp -f /etc/resolv.conf "${airootfs_dir}/etc/resolv.conf"
+    cp -rf "/etc/pacman.d/gnupg/" "${airootfs_dir}/etc/pacman.d/gnupg/"
+    cp -f "/etc/resolv.conf" "${airootfs_dir}/etc/resolv.conf"
     cp -f "${work_dir}/pacman-${arch}.conf" "${airootfs_dir}/etc/pacman.conf"
     # Create user to build AUR
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "/root/aur_prepare.sh ${_aur_packages_ls_str}" run
+    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "/root/aur_prepare.sh ${pkglist_aur[*]}" run
     rm -rf "${airootfs_dir}/etc/pacman.d/gnupg/"
     rm -rf "${airootfs_dir}/etc/resolv.conf"
     rm -rf "${airootfs_dir}/etc/pacman.conf"