Merge branch 'dev' into dev-stable

FascodeNet · Sep 19, 2021 · d0fb75b · d0fb75b
2 parents fad0ca6 + a9f9a8e
commit d0fb75b
Showing 1 changed file with 9 additions and 23 deletions.
diff --git a/build.sh b/build.sh
@@ -17,21 +17,12 @@ set -Eeu
 # Do not change these values.
 script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )"
 defaultconfig="${script_path}/default.conf"
-tools_dir="${script_path}/tools"
-module_dir="${script_path}/modules"
-customized_username=false
-customized_password=false
-customized_kernel=false
-customized_logpath=false
-pkglist_args=()
-makepkg_script_args=()
-modules=()
-DEFAULT_ARGUMENT=""
-ARGUMENT=("${@}")
+tools_dir="${script_path}/tools" module_dir="${script_path}/modules"
+customized_username=false customized_password=false customized_kernel=false customized_logpath=false
+pkglist_args=() makepkg_script_args=() modules=() norepopkg=()
+legacy_mode=false rerun=false
+DEFAULT_ARGUMENT="" ARGUMENT=("${@}")
 alteriso_version="3.1"
-norepopkg=()
-legacy_mode=false
-rerun=false
 
 # Load config file
 [[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
@@ -1026,13 +1017,11 @@ while true; do
             msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
             ;;
         -k | --kernel)
-            customized_kernel=true
-            kernel="${2}"
+            customized_kernel=true kernel="${2}"
             shift 2
             ;;
         -p | --password)
-            customized_password=true
-            password="${2}"
+            customized_password=true password="${2}"
             shift 2
             ;;
         -t | --comp-opts)
@@ -1049,14 +1038,11 @@ while true; do
             shift 2
             ;;
         --nodebug)
-            debug=false
-            msgdebug=false
-            bash_debug=false
+            debug=false msgdebug=false bash_debug=false
             shift 1
             ;;
         --logpath)
-            logging="${2}"
-            customized_logpath=true
+            logging="${2}" customized_logpath=true
             shift 2
             ;;
         --tar-type)