diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-05-11 11:40:42 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-05-11 11:40:42 +0100 |
| commit | 286c43af22d469fcbc7bef3f3bbca03de164acdf (patch) | |
| tree | 1849b8c806624af1ce2ed9fbfc117ceab13b7334 /subr/build_init.subr | |
| parent | 63eae076050d704eb568cc683523924861037611 (diff) | |
| download | midipix_build-286c43af22d469fcbc7bef3f3bbca03de164acdf.tar.bz2 midipix_build-286c43af22d469fcbc7bef3f3bbca03de164acdf.tar.xz | |
subr/build_init.subr:buildp_init_getopts(): allow mixing non-option arguments w/ options.
subr/pkgtool_init.subr:pkgtoolp_init_getopts(): allow mixing non-option arguments w/ options.
Diffstat (limited to 'subr/build_init.subr')
| -rw-r--r-- | subr/build_init.subr | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr index c876919b..2f66a9ff 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -176,13 +176,7 @@ buildp_init_getopts() { R) ARG_RELAXED=1; ;; *) cat etc/build.usage; exit 1; ;; esac; shift $((${OPTIND}-1)); OPTIND=1; - else - break; - fi; - done; - if [ "${_rc:-0}" -eq 0 ]; then - while [ ${#} -gt 0 ]; do - if [ "${1#=}" != "${1}" ]; then + else if rtl_match "${1}" "=*"; then BUILD_GROUPS_INHIBIT_DEPS=1; _arg="${1#=}"; else _arg="${1}"; @@ -193,30 +187,30 @@ buildp_init_getopts() { *[^_a-zA-Z]*) _rc=1; _status="Error: build group names must not contain [^_a-zA-Z] (in argument \`${_arg}'.)"; ;; *) BUILD_GROUPS="$(rtl_lconcat "${BUILD_GROUPS}" "${_arg}")"; ;; esac; shift; - done; + fi; + done; + if [ "${_rc:-0}" -eq 0 ]; then + case "${ARG_PARALLEL}" in + auto) if ! ARG_PARALLEL="$(rtl_get_cpu_count)"; then + _rc=1; _status="Error: failed to get CPU count."; + else + ARG_PARALLEL=$((${ARG_PARALLEL}/2)); + fi; ;; + "") ARG_PARALLEL=1; ;; + *) if ! rtl_isnumber "${ARG_PARALLEL}"; then + _rc=1; _status="Error: invalid jobs count \`${ARG_PARALLEL}'."; + fi; ;; + esac; if [ "${_rc:-0}" -eq 0 ]; then - case "${ARG_PARALLEL}" in - auto) if ! ARG_PARALLEL="$(rtl_get_cpu_count)"; then - _rc=1; _status="Error: failed to get CPU count."; - else - ARG_PARALLEL=$((${ARG_PARALLEL}/2)); - fi; ;; - "") ARG_PARALLEL=1; ;; - *) if ! rtl_isnumber "${ARG_PARALLEL}"; then - _rc=1; _status="Error: invalid jobs count \`${ARG_PARALLEL}'."; - fi; ;; + DEFAULT_BUILD_CPUS="${ARG_PARALLEL}"; + case "${ARG_VERBOSE:-0}" in + 0) rtl_fileop_set_log 0; rtl_log_set_lvl 0; ;; + 1) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; + 2) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; + 3) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; + 4) rtl_fileop_set_log 1; rtl_log_set_lvl 3; ;; + *) _rc=1; _status="Error: invalid verbosity level (max. -vvvv)"; ;; esac; - if [ "${_rc:-0}" -eq 0 ]; then - DEFAULT_BUILD_CPUS="${ARG_PARALLEL}"; - case "${ARG_VERBOSE:-0}" in - 0) rtl_fileop_set_log 0; rtl_log_set_lvl 0; ;; - 1) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; - 2) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; - 3) rtl_fileop_set_log 0; rtl_log_set_lvl 2; ;; - 4) rtl_fileop_set_log 1; rtl_log_set_lvl 3; ;; - *) _rc=1; _status="Error: invalid verbosity level (max. -vvvv)"; ;; - esac; - fi; fi; fi; return "${_rc}"; |