diff options
author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
commit | e1d4697bc4af580c8bbdb8256fdc90626e18a226 (patch) | |
tree | 99c4cf49c4ba57d83bb03512bce0a89a0ac9d9f3 /subr/pkg_install_rpm.subr | |
parent | b6a9a1a3c8b98077cce47d579069c42080d17da5 (diff) | |
download | midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.bz2 midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.xz |
Set -o nounset in addition to +o errexit -o nounset.
groups/000.host_tools.group:libtool_host:${PKG_LIBTOOL}: build w/ `none'.
subr/build_init.subr:buildp_init_getopts(): set ${DEFAULT_BUILD_CPUS} prior to ex_pkg_load_vars() call.
subr/pkg_{build,install_make}.subr: only pass `LIBTOOL=${PKG_LIBTOOL}' if set and not `none'.
vars/libtool_host.vars: removes obsolete vars file.
Diffstat (limited to 'subr/pkg_install_rpm.subr')
-rw-r--r-- | subr/pkg_install_rpm.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr index 6cc373ff..c0ba3e5e 100644 --- a/subr/pkg_install_rpm.subr +++ b/subr/pkg_install_rpm.subr @@ -1,5 +1,5 @@ # -# set +o errexit -o noglob is assumed. +# set +o errexit -o noglob -o nounset is assumed. # pkg_install_rpm() { @@ -7,9 +7,9 @@ pkg_install_rpm() { if rtl_lmatch "${ARG_DIST}" "rpm" ","\ && [ "${PKG_RPM_DISABLE:-0}" -eq 0 ]\ && [ -x "$(which rpmbuild 2>/dev/null)" ]; then - if [ -n "${PKG_URL}" ]; then + if [ -n "${PKG_URL:-}" ]; then _pkg_url="${PKG_URL}"; _pkg_version_full="${PKG_VERSION}"; _pkg_version_rpm="${PKG_VERSION%%-*}"; - elif [ -n "${PKG_URLS_GIT}" ]; then + elif [ -n "${PKG_URLS_GIT:-}" ]; then _pkg_version_rpm="$(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse HEAD)"; _pkg_version_full="${_pkg_version_rpm} ($(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse --abbrev-ref HEAD))"; _pkg_url="${PKG_URLS_GIT%% *}"; _pkg_url="${_pkg_url##*=}"; _pkg_url="${_pkg_url%%@*}"; |