[update] : Supported argument

Author: Hayao0819

build.sh

@@ -24,6 +24,7 @@ customized_password=false
 customized_kernel=false
 customized_logpath=false
 pkglist_args=()
+makepkg_script_args=()
 modules=()
 DEFAULT_ARGUMENT=""
 alteriso_version="3.1"
@@ -473,22 +474,12 @@ prepare_build() {
     eval "$(bash "${tools_dir}/locale.sh" -s -a "${arch}" get "${locale_name}")"
     eval "$(bash "${tools_dir}/kernel.sh" -s -c "${channel_name}" -a "${arch}" get "${kernel}")"
 
-    # Set username
-    if [[ "${customized_username}" = false ]]; then
-        username="${defaultusername}"
-    fi
-
-    # Set password
-    if [[ "${customized_password}" = false ]]; then
-        password="${defaultpassword}"
-    fi
+    # Set username and password
+    [[ "${customized_username}" = false ]] && username="${defaultusername}"
+    [[ "${customized_password}" = false ]] && password="${defaultpassword}"
 
     # gitversion
-    if [[ "${gitversion}" = true ]]; then
-        cd "${script_path}"
-        iso_version="${iso_version}-$(git rev-parse --short HEAD)"
-        cd "${OLDPWD}"
-    fi
+    [[ "${gitversion}" = true ]] && iso_version="${iso_version}-$(cd "${script_path}"; git rev-parse --short HEAD)"
 
     # Generate iso file name.
     local _channel_name="${channel_name%.add}-${locale_version}"
@@ -524,11 +515,15 @@ prepare_build() {
 
     # Set argument of pkglist.sh
     pkglist_args=("-a" "${arch}" "-k" "${kernel}" "-c" "${channel_dir}" "-l" "${locale_name}")
-    if [[ "${boot_splash}"   = true ]]; then pkglist_args+=("-b"); fi
-    if [[ "${debug}"         = true ]]; then pkglist_args+=("-d"); fi
-    if [[ "${memtest86}"     = true ]]; then pkglist_args+=("-m"); fi
-    if (( "${#additional_exclude_pkg[@]}" >= 1 )); then pkglist_args+=("-e" "${additional_exclude_pkg[*]}"); fi
+    [[ "${boot_splash}"              = true ]] && pkglist_args+=("-b")
+    [[ "${debug}"                    = true ]] && pkglist_args+=("-d")
+    [[ "${memtest86}"                = true ]] && pkglist_args+=("-m")
+    (( "${#additional_exclude_pkg[@]}" >= 1 )) && pkglist_args+=("-e" "${additional_exclude_pkg[*]}"); fi
     pkglist_args+=("${modules[@]}")
+
+    # Set argument of aur.sh and pkgbuild.sh
+    [[ "${bash_debug}"   = true ]] && makepkg_script_args+=("-x")
+    [[ "${pacman_debug}" = true ]] && makepkg_script_args+=("-d")
 }
 
 
@@ -595,7 +590,7 @@ make_packages_aur() {
     cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
 
     # Run aur script
-    _run_with_pacmanconf _chroot_run "bash $([[ "${bash_debug}" = true ]] && echo -n "-x") /root/aur.sh ${_pkglist_aur[*]}"
+    _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}"
 
     # Remove script
     remove "${airootfs_dir}/root/aur.sh"
@@ -618,7 +613,7 @@ make_pkgbuild() {
     cp -rf --preserve=mode "${script_path}/system/pkgbuild.sh" "${airootfs_dir}/root/pkgbuild.sh"
 
     # Run build script
-    _run_with_pacmanconf _chroot_run "bash $([[ "${bash_debug}" = true ]] && echo -n "-x") /root/pkgbuild.sh /pkgbuilds"
+    _run_with_pacmanconf _chroot_run "bash" "/root/pkgbuild.sh" "${makepkg_script_args[@]}" "/pkgbuilds"
 
     # Remove script
     remove "${airootfs_dir}/root/pkgbuild.sh"

system/aur.sh

@@ -9,9 +9,40 @@
 set -e -u
 
 aur_username="aurbuild"
+pacman_debug=true
 
 trap 'exit 1' 1 2 3 15
 
+_help() {
+    echo "usage ${0} [option]"
+    echo
+    echo "Install aur packages with yay" 
+    echo
+    echo " General options:"
+    echo "    -d                       Enable pacman debug message"
+    echo "    -u [user]                Set the user name to build packages"
+    echo "    -x                       Enable bash debug message"
+    echo "    -h                       This help message"
+}
+
+while getopts "du:xh" arg; do
+    case "${arg}" in
+        d) pacman_debug=true ;;
+        u) aur_username="${OPTARG}" ;;
+        x) set -xv ;;
+        h) 
+            _help
+            exit 0
+            ;;
+        *)
+            _help
+            exit 1
+            ;;
+    esac
+done
+
+shift "$((OPTIND - 1))"
+
 # Show message when file is removed
 # remove <file> <file> ...
 remove() {

system/pkgbuild.sh

@@ -9,7 +9,37 @@
 set -e
 
 build_username="pkgbuild"
+pacman_debug=true
 
+_help() {
+    echo "usage ${0} [option]"
+    echo
+    echo "Build and install PKGBUILD" 
+    echo
+    echo " General options:"
+    echo "    -d                       Enable pacman debug message"
+    echo "    -u [user]                Set the user name to build packages"
+    echo "    -x                       Enable bash debug message"
+    echo "    -h                       This help message"
+}
+
+while getopts "du:xh" arg; do
+    case "${arg}" in
+        d) pacman_debug=true ;;
+        u) build_username="${OPTARG}" ;;
+        x) set -xv ;;
+        h) 
+            _help
+            exit 0
+            ;;
+        *)
+            _help
+            exit 1
+            ;;
+    esac
+done
+
+shift "$((OPTIND - 1))"
 
 # Delete file only if file exists
 # remove <file1> <file2> ...