OSDN Git Service

[change] : Changed not to use var.
authorhayao <shun819.mail@gmail.com>
Mon, 29 Jun 2020 10:34:55 +0000 (19:34 +0900)
committerhayao <shun819.mail@gmail.com>
Mon, 29 Jun 2020 10:34:55 +0000 (19:34 +0900)
build.sh

index 4c989a1..b70b2e2 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -884,8 +884,8 @@ make_packages_aur() {
         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 
+        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" \
+            -p $("ls ${work_dir}/${arch}/airootfs/aurbuild_temp/${_aur_pkg}"/*.pkg.tar.*) install_file
 
     done
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "userdel aurbuild" run