diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-05-11 14:47:13 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-05-11 14:47:13 +0100 |
| commit | 00331b09b0a7a237c0542fb528609765747ad066 (patch) | |
| tree | a3e06f07f4e63cc883c8358083d5c9d125ba8ee5 | |
| parent | 557ea8b80d7b363fcc2dada7bf84894253387c42 (diff) | |
| download | midipix_build-00331b09b0a7a237c0542fb528609765747ad066.tar.bz2 midipix_build-00331b09b0a7a237c0542fb528609765747ad066.tar.xz | |
subr/ex_pkg_restart.subr:ex_pkg_process_restart_spec(): correctly lift ${${_epprs_rspec}} into SP-separated list on return.
devbuild.sh: updated.
| -rwxr-xr-x | devbuild.sh | 27 | ||||
| -rw-r--r-- | subr/ex_pkg_restart.subr | 5 |
2 files changed, 20 insertions, 12 deletions
diff --git a/devbuild.sh b/devbuild.sh index c41f58ac..4900077e 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -1,28 +1,35 @@ #!/bin/sh +dmp_lift() { + local _rlist="${1#\$}" IFS="${2}" _IFS1="${3}"; + eval set -- '${'"${_rlist}"'}'; IFS="${_IFS1}"; eval ${_rlist}='${*}'; +}; + devbuild_midipix() { set -eu - DEV_PACKAGES=\ - musl_no_complex_host,musl_full_host,musl_full,\ - psxtypes,pemagine,dalist,ldso,ntcon,ntapi,\ - psxscl,psxscl_strace,ntctty,ntux,ptycon,toksvc,u16ports,\ - ntctty_minipix,ntux_minipix,ptycon_minipix,toksvc_minipix + DEV_PACKAGES=" \ + musl_no_complex_host musl_full_host musl_full \ + psxtypes pemagine dalist ldso ntcon ntapi \ + psxscl psxscl_strace ntctty ntux ptycon toksvc u16ports \ + ntctty_minipix ntux_minipix ptycon_minipix toksvc_minipix"; + dmp_lift \$DEV_PACKAGES " " ","; mb_project_dir=$(cd "$(dirname $0)" ; pwd) cd "$mb_project_dir" - ./build.sh -r ${DEV_PACKAGES} - ./build.sh -D minipix + ./build.sh -r "${DEV_PACKAGES}" "${@}"; + ./build.sh -D minipix "${@}"; }; devbuild_all() { - ./build.sh -a nt64 -b release -D minipix,rpm,zipdist -F ipv4 -p 6 -v && ./build.sh -a nt64 -b debug -D minipix,rpm,zipdist -F ipv4 -p 6 -v; + ./build.sh -a nt64 -b release -D minipix,rpm,zipdist -F ipv4 -p 6 -v &&\ + ./build.sh -a nt64 -b debug -D minipix,rpm,zipdist -F ipv4 -p 6 -v; }; case "${1:-}" in ---all) devbuild_all; ;; -*) devbuild_midipix; ;; +--all) shift; devbuild_all "${@}"; ;; +*) devbuild_midipix "${@}"; ;; esac; # vim:filetype=sh textwidth=0 diff --git a/subr/ex_pkg_restart.subr b/subr/ex_pkg_restart.subr index 6f9bfe98..b45851f2 100644 --- a/subr/ex_pkg_restart.subr +++ b/subr/ex_pkg_restart.subr @@ -280,8 +280,9 @@ ex_pkg_process_restart_spec() { if [ "${_epprs_step}" = "${_epprs_step1}" ]; then eval ${_epprs_rspec_at}='${'"${_epprs_rspec_at}"':+${'"${_epprs_rspec_at}"'},}finish'; fi; - fi; ;; - esac; + fi; + eval echo '${'"${_epprs_rspec}"'}'; ;; + esac; rtl_llift3 "${_epprs_rspec}" "," " " || _epprs_rc=1; else _epprs_rc=1; fi; |