Merge branch 'dev' into dev-stable

Author: Hayao0819

build.sh

@@ -1063,7 +1063,7 @@ make_efi() {
 # 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"

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 ;;