@@ -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
@@ -675,8 +675,8 @@ make_setup_mkinitcpio() {
675675# Prepare kernel/initramfs ${install_dir}/boot/
676676make_boot () {
677677 mkdir -p " ${isofs_dir} /${install_dir} /boot/${arch} "
678- _cp " ${airootfs_dir} /boot/archiso.img" " ${isofs_dir} /${install_dir} /boot/${arch} /archiso.img"
679- _cp " ${airootfs_dir} /boot/${kernel_filename} " " ${isofs_dir} /${install_dir} /boot/${arch} /${kernel_filename} "
678+ install -m 0644 -- " ${airootfs_dir} /boot/archiso.img" " ${isofs_dir} /${install_dir} /boot/${arch} /archiso.img"
679+ install -m 0644 -- " ${airootfs_dir} /boot/${kernel_filename} " " ${isofs_dir} /${install_dir} /boot/${arch} /${kernel_filename} "
680680
681681 return 0
682682}
@@ -737,8 +737,8 @@ make_syslinux() {
737737 done
738738
739739 # Set syslinux wallpaper
740- _cp " ${script_path} /syslinux/splash.png" " ${isofs_dir} /syslinux"
741- [[ -f " ${channel_dir} /splash.png" ]] && _cp " ${channel_dir} /splash.png" " ${isofs_dir} /syslinux"
740+ install -m 0644 -- " ${script_path} /syslinux/splash.png" " ${isofs_dir} /syslinux/ "
741+ [[ -f " ${channel_dir} /splash.png" ]] && install -m 0644 -- " ${channel_dir} /splash.png" " ${isofs_dir} /syslinux"
742742
743743 # remove config
744744 local _remove_config
@@ -751,9 +751,9 @@ make_syslinux() {
751751 [[ " ${memtest86} " = false ]] && _remove_config memtest86.cfg
752752
753753 # copy files
754- _cp " ${airootfs_dir} /usr/lib/syslinux/bios/" * .c32 " ${isofs_dir} /syslinux"
755- _cp " ${airootfs_dir} /usr/lib/syslinux/bios/lpxelinux.0" " ${isofs_dir} /syslinux"
756- _cp " ${airootfs_dir} /usr/lib/syslinux/bios/memdisk" " ${isofs_dir} /syslinux"
754+ install -m 0644 -- " ${airootfs_dir} /usr/lib/syslinux/bios/" * .c32 " ${isofs_dir} /syslinux/ "
755+ install -m 0644 -- " ${airootfs_dir} /usr/lib/syslinux/bios/lpxelinux.0" " ${isofs_dir} /syslinux/ "
756+ install -m 0644 -- " ${airootfs_dir} /usr/lib/syslinux/bios/memdisk" " ${isofs_dir} /syslinux/ "
757757
758758
759759 if [[ -e " ${isofs_dir} /syslinux/hdt.c32" ]]; then
0 commit comments