OSDN Git Service

[change] : Changed name of var and script.
authorhayao <shun819.mail@gmail.com>
Mon, 29 Jun 2020 10:31:23 +0000 (19:31 +0900)
committerhayao <shun819.mail@gmail.com>
Mon, 29 Jun 2020 10:31:23 +0000 (19:31 +0900)
build.sh

index 3669bd0..4c989a1 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -879,11 +879,12 @@ make_packages_aur() {
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "chmod 777 /aurbuild_temp" run
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "useradd -d /aurbuild_temp aurbuild" run
     echo "aurbuild ALL=(ALL) NOPASSWD:ALL" > ${work_dir}/${arch}/airootfs/etc/sudoers.d/aurbuild
-    for _pkg2 in ${pkglist_aur[@]}; do
-        echo  "cd ~ ; git clone https://aur.archlinux.org/${_pkg2}.git ; cd ${_pkg2} ; makepkg -cs " > ${work_dir}/${arch}/airootfs/aurbuild_temp/test.sh
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "chmod 777 /aurbuild_temp/test.sh" run
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "sudo -u aurbuild /aurbuild_temp/test.sh" run
-        pkgf=`ls ${work_dir}/${arch}/airootfs/aurbuild_temp/${_pkg2}/*.pkg.tar.*`
+    local _aur_pkg
+    for _aur_pkg in ${pkglist_aur[@]}; do
+        echo  "cd ~ ; git clone https://aur.archlinux.org/${_aur_pkg}.git ; cd ${_aur_pkg} ; makepkg -cs " > ${work_dir}/${arch}/airootfs/aurbuild_temp/aur_build.sh
+        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "chmod 777 /aurbuild_temp/aur_build.sh" run
+        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "sudo -u aurbuild /aurbuild_temp/aur_build.sh" run
+        pkgf=`ls ${work_dir}/${arch}/airootfs/aurbuild_temp/${_aur_pkg}/*.pkg.tar.*`
         ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p $pkgf install_file 
 
     done