Merge branch 'stable'

Author: Hayao0819

build.sh

@@ -911,7 +911,7 @@ make_customize_airootfs() {
 
     # /root permission
     # https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59
-    chmod -f 750 "${work_dir}/x86_64/airootfs/root"
+    chmod -f 750 "${work_dir}/${arch}/airootfs/root"
 }
 
 # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
@@ -1040,7 +1040,10 @@ make_isolinux() {
 # Prepare /EFI
 make_efi() {
     mkdir -p "${work_dir}/iso/EFI/boot"
-    cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/iso/EFI/boot/bootx64.efi"
+    (
+        local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
+        cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
+    )
 
     mkdir -p "${work_dir}/iso/loader/entries"
     cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
@@ -1052,13 +1055,15 @@ make_efi() {
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
+    if [[ -f "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
+    fi
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
 make_efiboot() {
     mkdir -p "${work_dir}/iso/EFI/archiso"
-    truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
+    truncate -s 100M "${work_dir}/iso/EFI/archiso/efiboot.img"
     mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
 
     mkdir -p "${work_dir}/efiboot"
@@ -1078,7 +1083,10 @@ make_efiboot() {
     cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
 
     mkdir -p "${work_dir}/efiboot/EFI/boot"
-    cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/efiboot/EFI/boot/bootx64.efi"
+    (
+        local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
+        cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
+    )
 
     mkdir -p "${work_dir}/efiboot/loader/entries"
     cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
@@ -1090,7 +1098,9 @@ make_efiboot() {
         "${script_path}/efiboot/loader/entries/cd/archiso-x86_64-cd-${kernel}.conf" > "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
 
     # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
+    if [[ -f "${work_dir}/iso/shellx64.efi" ]]; then
+        cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
+    fi
 
     umount -d "${work_dir}/efiboot"
 }

channels/cinnamon/packages.i686/other.i686

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

channels/cinnamon/packages.x86_64/other.x86_64

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

channels/i3/packages.i686/packages.i686

@@ -28,6 +28,7 @@ smartmontools
 testdisk
 vim-minimal
 grub-theme-vimix
+smbclient
 gvfs-smb
 gvfs
 sshfs

channels/i3/packages.x86_64/packages.x86_64

@@ -28,6 +28,7 @@ smartmontools
 testdisk
 vim-minimal
 grub-theme-vimix
+smbclient
 gvfs-smb
 gvfs
 sshfs

channels/lxde/packages.i686/other.i686

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

channels/lxde/packages.x86_64/other.x86_64

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

channels/xfce/packages.i686/other.i686

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

channels/xfce/packages.x86_64/other.x86_64

@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

fullbuild.sh

@@ -162,19 +162,31 @@ trap_exit() {
 
 
 build() {
+    local _exit_code=0
+
     options="${share_options} -a ${arch} ${cha}"
 
     if [[ ! -e "${work_dir}/fullbuild.${cha}_${arch}" ]]; then
         _msg_info "Build ${cha} with ${arch} architecture."
         sudo bash ${script_path}/build.sh ${options}
-        touch "${work_dir}/fullbuild.${cha}_${arch}"
+        _exit_code="${?}"
+        if [[ "${_exit_code}" = 0 ]]; then
+            touch "${work_dir}/fullbuild.${cha}_${arch}"
+        else
+            _msg_error "build.sh finished with exit code ${_exit_code}. Will try again."
+        fi
     fi
     sudo pacman -Sccc --noconfirm > /dev/null 2>&1
 
     if [[ ! -e "${work_dir}/fullbuild.${cha}_${arch}_jp" ]]; then
         _msg_info "Build the Japanese version of ${cha} on the ${arch} architecture."
         sudo bash ${script_path}/build.sh -j ${options}
-        touch "${work_dir}/fullbuild.${cha}_${arch}_jp"
+        _exit_code="${?}"
+        if [[ "${_exit_code}" = 0 ]]; then
+            touch "${work_dir}/fullbuild.${cha}_${arch}_jp"
+        else
+            _msg_error "build.sh finished with exit code ${_exit_code}. Will try again."
+        fi
     fi
     sudo pacman -Sccc --noconfirm > /dev/null 2>&1
 }
@@ -207,7 +219,7 @@ _help() {
 share_options="--noconfirm"
 default_options="-b -l -u alter -p alter"
 
-while getopts 'a:dghr:sc' arg; do
+while getopts 'a:dghr:scm:' arg; do
     case "${arg}" in
         a) share_options="${share_options} ${OPTARG}" ;;
         c) all_channel=true ;;