From f882c40e6df03b13e8bed443b1a5f64e3a9a3529 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 5 Jul 2020 16:16:11 +0900 Subject: [PATCH] Revert "[update] : Simplified AUR processing" This reverts commit a97d4abfb3cb2a1a7c7239f0b191371367a268cd. --- build.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index bdaa3ef0..f3d93c4d 100755 --- a/build.sh +++ b/build.sh @@ -883,7 +883,7 @@ make_packages_aur() { ) set -e - # _msg_debug "${pkglist_aur[@]}" + # _msg_debug "${pkglist[@]}" # Create a list of packages to be finally installed as packages.list directly under the working directory. echo -e "\n\n# AUR packages.\n#" >> "${work_dir}/packages.list" @@ -899,10 +899,14 @@ make_packages_aur() { chmod 755 "${work_dir}/${arch}/airootfs/root/aur.sh" cp -r "${script_path}/system/aur_remove.sh" "${work_dir}/${arch}/airootfs/root/aur_remove.sh" chmod 755 "${work_dir}/${arch}/airootfs/root/aur_remove.sh" - - ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -D "${install_dir}" -r "/root/aur.sh ${pkglist_aur[*]}" run + local _aur_packages_ls_str + _aur_packages_ls_str="" + for _pkg24 in ${pkglist_aur[@]}; do + _aur_packages_ls_str="${_aur_packages_ls_str} ${_pkg24}" + done + ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -D "${install_dir}" -r "/root/aur.sh ${_aur_packages_ls_str}" run - for _pkg in ${pkglist_aur[@]}; do + for _pkg22 in ${pkglist_aur[@]}; do ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "${work_dir}/${arch}/airootfs/aurbuild_temp/${_pkg22}/*.pkg.tar.*" install_file done ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -D "${install_dir}" -r "/root/aur_remove.sh" run -- 2.11.0