Skip to content

Commit 999fe16

Browse files
committed
[update] : Use install command instead of cp command
1 parent b124908 commit 999fe16

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

build.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,9 @@ make_customize_airootfs() {
583583

584584
# Replace /etc/mkinitcpio.conf if Plymouth is enabled.
585585
if [[ "${boot_splash}" = true ]]; then
586-
_cp "${script_path}/mkinitcpio/mkinitcpio-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
586+
install -m 0644 -- "${script_path}/mkinitcpio/mkinitcpio-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
587587
else
588-
_cp "${script_path}/mkinitcpio/mkinitcpio.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
588+
install -m 0644 -- "${script_path}/mkinitcpio/mkinitcpio.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
589589
fi
590590

591591
# customize_airootfs options
@@ -633,7 +633,7 @@ make_customize_airootfs() {
633633
done
634634

635635
chmod 755 "${airootfs_dir}/${_main_script}"
636-
_cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename "${_main_script}")"
636+
cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename "${_main_script}")"
637637
_chroot_run "${_main_script}" "${_airootfs_script_options[@]}"
638638
remove "${airootfs_dir}/${_main_script}"
639639

@@ -649,15 +649,15 @@ make_setup_mkinitcpio() {
649649
mkdir -p "${airootfs_dir}/etc/initcpio/hooks" "${airootfs_dir}/etc/initcpio/install"
650650

651651
for _hook in "archiso" "archiso_shutdown" "archiso_pxe_common" "archiso_pxe_nbd" "archiso_pxe_http" "archiso_pxe_nfs" "archiso_loop_mnt"; do
652-
_cp "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
653-
_cp "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
652+
install -m 0644 -- "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
653+
install -m 0644 -- "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
654654
done
655655

656656
sed -i "s|%COWSPACE%|${cowspace}|g" "${airootfs_dir}/etc/initcpio/hooks/archiso"
657657
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${airootfs_dir}/etc/initcpio/install/archiso_shutdown"
658-
_cp "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
659-
_cp "${script_path}/system/initcpio/script/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
660-
_cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
658+
install -m 0644 -- "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
659+
install -m 0755 -- "${script_path}/system/initcpio/script/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
660+
install -m 0644 -- "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
661661
[[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
662662

663663
if [[ "${gpg_key}" ]]; then

0 commit comments

Comments
 (0)