Skip to content

Commit c1fa715

Browse files
committed
[update] : Run one script
1 parent 2c824d5 commit c1fa715

1 file changed

Lines changed: 15 additions & 13 deletions

File tree

build.sh

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ make_pkgbuild() {
751751
# Customize installation (airootfs)
752752
make_customize_airootfs() {
753753
# Overwrite airootfs with customize_airootfs.
754-
local _airootfs _airootfs_script_options _script _script_list _airootfs_list
754+
local _airootfs _airootfs_script_options _script _script_list _airootfs_list _main_script
755755

756756
_airootfs_list=(
757757
"${share_dir}/airootfs.any"
@@ -808,28 +808,30 @@ make_customize_airootfs() {
808808
[[ "${rebuild}" = true ]] && _airootfs_script_options="${_airootfs_script_options} -r"
809809

810810

811+
_main_script="/root/customize_airootfs.sh"
812+
811813
_script_list=(
812-
"/root/customize_airootfs.sh"
813-
"/root/customize_airootfs.sh"
814-
"/root/customize_airootfs_${channel_name}.sh"
815-
"/root/customize_airootfs_${channel_name%.add}.sh"
814+
"${airootfs_dir}/root/customize_airootfs_${channel_name}.sh"
815+
"${airootfs_dir}/root/customize_airootfs_${channel_name%.add}.sh"
816816
)
817817

818818
if [[ "${include_extra}" = true ]]; then
819-
_script_list+=(
820-
"/root/customize_airootfs_share-extra.sh"
821-
)
819+
_script_list+=("${airootfs_dir}/root/customize_airootfs_share-extra.sh")
822820
fi
823821

824-
# Script permission
822+
# Create script
825823
for _script in ${_script_list[@]}; do
826-
if [[ -f "${airootfs_dir}/${_script}" ]]; then
827-
chmod 755 "${airootfs_dir}/${_script}"
828-
${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "${_script} ${_airootfs_script_options}" run
829-
remove "${airootfs_dir}/${_script}"
824+
if [[ -f "${_script}" ]]; then
825+
echo -e "\n" >> "${airootfs_dir}/${_main_script}"
826+
cat "${_script}" >> "${airootfs_dir}/${_main_script}"
827+
remove "${_script}"
830828
fi
831829
done
832830

831+
chmod 755 "${airootfs_dir}/${_main_script}"
832+
${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "${_main_script} ${_airootfs_script_options}" run
833+
remove "${airootfs_dir}/${_main_script}"
834+
833835
# /root permission https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59
834836
chmod -f 750 "${airootfs_dir}/root"
835837
}

0 commit comments

Comments
 (0)