| Revisão | d0fb75b7f609c055554e595c0942970305ffad20 (tree) |
|---|---|
| Hora | 2021-09-20 00:10:03 |
| Autor | hayao <hayao@fasc...> |
| Commiter | hayao |
Merge branch 'dev' into dev-stable
| @@ -17,21 +17,12 @@ set -Eeu | ||
| 17 | 17 | # Do not change these values. |
| 18 | 18 | script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )" |
| 19 | 19 | 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=("${@}") | |
| 31 | 25 | alteriso_version="3.1" |
| 32 | -norepopkg=() | |
| 33 | -legacy_mode=false | |
| 34 | -rerun=false | |
| 35 | 26 | |
| 36 | 27 | # Load config file |
| 37 | 28 | [[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1 |
| @@ -1026,13 +1017,11 @@ while true; do | ||
| 1026 | 1017 | msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1" |
| 1027 | 1018 | ;; |
| 1028 | 1019 | -k | --kernel) |
| 1029 | - customized_kernel=true | |
| 1030 | - kernel="${2}" | |
| 1020 | + customized_kernel=true kernel="${2}" | |
| 1031 | 1021 | shift 2 |
| 1032 | 1022 | ;; |
| 1033 | 1023 | -p | --password) |
| 1034 | - customized_password=true | |
| 1035 | - password="${2}" | |
| 1024 | + customized_password=true password="${2}" | |
| 1036 | 1025 | shift 2 |
| 1037 | 1026 | ;; |
| 1038 | 1027 | -t | --comp-opts) |
| @@ -1049,14 +1038,11 @@ while true; do | ||
| 1049 | 1038 | shift 2 |
| 1050 | 1039 | ;; |
| 1051 | 1040 | --nodebug) |
| 1052 | - debug=false | |
| 1053 | - msgdebug=false | |
| 1054 | - bash_debug=false | |
| 1041 | + debug=false msgdebug=false bash_debug=false | |
| 1055 | 1042 | shift 1 |
| 1056 | 1043 | ;; |
| 1057 | 1044 | --logpath) |
| 1058 | - logging="${2}" | |
| 1059 | - customized_logpath=true | |
| 1045 | + logging="${2}" customized_logpath=true | |
| 1060 | 1046 | shift 2 |
| 1061 | 1047 | ;; |
| 1062 | 1048 | --tar-type) |
Fork
build.sh