Skip to content

Commit 13500a9

Browse files
committed
[fix] : bash syntax
1 parent d8964ae commit 13500a9

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

build.sh

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -616,9 +616,8 @@ make_packages_repo() {
616616

617617
# Create a list of packages to be finally installed as packages.list directly under the working directory.
618618
echo -e "# The list of packages that is installed in live cd.\n#\n\n" > "${work_dir}/packages.list"
619-
for _pkg in ${_pkglist[@]}; do
620-
echo ${_pkg} >> "${work_dir}/packages.list"
621-
done
619+
#for _pkg in ${_pkglist[@]}; do echo ${_pkg} >> "${work_dir}/packages.list"; done
620+
printf "%s\n" "${_pkglist[@]}" >> "${work_dir}/packages.list"
622621

623622
# Install packages on airootfs
624623
${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "${_pkglist[*]}" install
@@ -641,7 +640,8 @@ make_packages_aur() {
641640

642641
# Create a list of packages to be finally installed as packages.list directly under the working directory.
643642
echo -e "\n\n# AUR packages.\n#\n\n" >> "${work_dir}/packages.list"
644-
for _pkg in ${_pkglist_aur[@]}; do echo ${_pkg} >> "${work_dir}/packages.list"; done
643+
#for _pkg in ${_pkglist_aur[@]}; do echo ${_pkg} >> "${work_dir}/packages.list"; done
644+
printf "%s\n" "${_pkglist_aur[@]}" >> "${work_dir}/packages.list"
645645

646646
# prepare for yay
647647
cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
@@ -657,18 +657,10 @@ make_packages_aur() {
657657

658658
make_pkgbuild() {
659659
#-- PKGBUILDが入ってるディレクトリの一覧 --#
660-
local _pkgbuild_dirs=(
661-
"${share_dir}/pkgbuild.any"
662-
"${share_dir}/pkgbuild.${arch}"
663-
"${channel_dir}/pkgbuild.any"
664-
"${channel_dir}/pkgbuild.${arch}"
665-
)
660+
local _pkgbuild_dirs=("${share_dir}/pkgbuild.any" "${share_dir}/pkgbuild.${arch}" "${channel_dir}/pkgbuild.any" "${channel_dir}/pkgbuild.${arch}")
666661

667662
if [[ "${include_extra}" = true ]]; then
668-
_pkgbuild_dirs+=(
669-
"${extra_dir}/pkgbuild.any"
670-
"${extra_dir}/pkgbuild.${arch}"
671-
)
663+
_pkgbuild_dirs+=("${extra_dir}/pkgbuild.any" "${extra_dir}/pkgbuild.${arch}")
672664
fi
673665

674666
#-- PKGBUILDが入ったディレクトリを作業ディレクトリにコピー --#
@@ -687,26 +679,17 @@ make_pkgbuild() {
687679

688680
# Remove script
689681
remove "${airootfs_dir}/root/pkgbuild.sh"
690-
691682
}
692683

693684
# Customize installation (airootfs)
694685
make_customize_airootfs() {
695686
# Overwrite airootfs with customize_airootfs.
696687
local _airootfs _airootfs_script_options _script _script_list _airootfs_list _main_script
697688

698-
_airootfs_list=(
699-
"${share_dir}/airootfs.any"
700-
"${share_dir}/airootfs.${arch}"
701-
"${channel_dir}/airootfs.${arch}"
702-
"${channel_dir}/airootfs.any"
703-
)
689+
_airootfs_list=("${share_dir}/airootfs.any" "${share_dir}/airootfs.${arch}" "${channel_dir}/airootfs.${arch}" "${channel_dir}/airootfs.any")
704690

705691
if [[ "${include_extra}" = true ]]; then
706-
_airootfs_list+=(
707-
"${extra_dir}/airootfs.any"
708-
"${extra_dir}/airootfs.${arch}"
709-
)
692+
_airootfs_list+=("${extra_dir}/airootfs.any" "${extra_dir}/airootfs.${arch}")
710693
fi
711694

712695
for _airootfs in ${_airootfs_list[@]};do

0 commit comments

Comments
 (0)