Skip to content

Commit d0fb75b

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents fad0ca6 + a9f9a8e commit d0fb75b

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

build.sh

+9-23
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,12 @@ set -Eeu
1717
# Do not change these values.
1818
script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )"
1919
defaultconfig="${script_path}/default.conf"
20-
tools_dir="${script_path}/tools"
21-
module_dir="${script_path}/modules"
22-
customized_username=false
23-
customized_password=false
24-
customized_kernel=false
25-
customized_logpath=false
26-
pkglist_args=()
27-
makepkg_script_args=()
28-
modules=()
29-
DEFAULT_ARGUMENT=""
30-
ARGUMENT=("${@}")
20+
tools_dir="${script_path}/tools" module_dir="${script_path}/modules"
21+
customized_username=false customized_password=false customized_kernel=false customized_logpath=false
22+
pkglist_args=() makepkg_script_args=() modules=() norepopkg=()
23+
legacy_mode=false rerun=false
24+
DEFAULT_ARGUMENT="" ARGUMENT=("${@}")
3125
alteriso_version="3.1"
32-
norepopkg=()
33-
legacy_mode=false
34-
rerun=false
3526

3627
# Load config file
3728
[[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
@@ -1026,13 +1017,11 @@ while true; do
10261017
msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
10271018
;;
10281019
-k | --kernel)
1029-
customized_kernel=true
1030-
kernel="${2}"
1020+
customized_kernel=true kernel="${2}"
10311021
shift 2
10321022
;;
10331023
-p | --password)
1034-
customized_password=true
1035-
password="${2}"
1024+
customized_password=true password="${2}"
10361025
shift 2
10371026
;;
10381027
-t | --comp-opts)
@@ -1049,14 +1038,11 @@ while true; do
10491038
shift 2
10501039
;;
10511040
--nodebug)
1052-
debug=false
1053-
msgdebug=false
1054-
bash_debug=false
1041+
debug=false msgdebug=false bash_debug=false
10551042
shift 1
10561043
;;
10571044
--logpath)
1058-
logging="${2}"
1059-
customized_logpath=true
1045+
logging="${2}" customized_logpath=true
10601046
shift 2
10611047
;;
10621048
--tar-type)

0 commit comments

Comments
 (0)