OSDN Git Service

[fix] : Fixed an issue where package installation stopped.
authorhayao <shun819.mail@gmail.com>
Wed, 4 Mar 2020 10:46:18 +0000 (19:46 +0900)
committerhayao <shun819.mail@gmail.com>
Wed, 4 Mar 2020 10:46:18 +0000 (19:46 +0900)
build.sh
packages.d/template.x86_64.example [moved from packages.d/template.x86_64 with 100% similarity]

index 1668fa6..b243b30 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -159,6 +159,7 @@ make_basefs() {
 
 # Additional packages (airootfs)
 make_packages() {
+    set +eu
     local _pkg_list
     local _pkg
     local _file
@@ -170,16 +171,16 @@ make_packages() {
     _pkg_list=(
         $(
             for _pkg in ${_pkg_list[@]}; do
-                echo ${_pkg}
+                echo "${_pkg}"
             done \
             | sort
         )
     )
-
+    set -eu
     # echo ${_pkg_list[@]}; exit
 
     # mkarchiso ${alteriso_option} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^'#' ${script_path}/packages.x86_64)" install
-    mkarchiso ${alteriso_option} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "${_package_list[@]}" install
+    mkarchiso ${alteriso_option} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "${_pkg_list[@]}" install
 }
 
 # Copy mkinitcpio archiso hooks and build initramfs (airootfs)