diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-11 21:26:12 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-11 21:26:12 (EDT) |
| commit | e0380430cdb4a272d3f858abc132eddc676ce58c (patch) | |
| tree | 9c88b010371410a756e7f602e2c100a9c8ea862d /lib/package.sh | |
| parent | 3023ae350823f87b2f21a0bad0a2a11b3e58dc4c (diff) | |
Use (or plan to use) _ob_warn_msg()
Diffstat (limited to 'lib/package.sh')
| -rw-r--r-- | lib/package.sh | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/package.sh b/lib/package.sh index 2e97af3..75f2f29 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -26,7 +26,6 @@ _OB_BINARY_PARAMETERS= ob_init_package() { local dir= - local orig_text_domain= if [ ${#} -eq 1 ]; then dir="${1}" @@ -45,10 +44,7 @@ ob_init_package() fi if [ -z "${_OB_PACKAGE_FORMAT}" ]; then - orig_text_domain="$(ob_get_text_domain)" - ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" - ob_warn "$(ob_get_msg 'unable_to_detect_package_format')" - ob_set_text_domain "${orig_text_domain}" + _ob_warn_msg 'unable_to_detect_package_format' return 1 fi @@ -142,7 +138,6 @@ ob_get_binary_packages() local pkg= local pkgs_clean= local pkg_clean= - local orig_text_domain= OPTIND=1 while getopts 'a:P:' opt; do @@ -170,16 +165,13 @@ ob_get_binary_packages() _ob_package_do 'get_binary_packages' - orig_text_domain="$(ob_get_text_domain)" - ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" - pkgs_clean=' ' for pkg in ${_OB_BINARY_PACKAGES}; do # Validate the name. if ! ob_validate_binary_name "${pkg}"; then - ob_warn "$(ob_get_msg 'bad_binary_name')" "${pkg}" + _ob_warn_msg 'bad_binary_name' "${pkg}" continue fi @@ -188,7 +180,7 @@ ob_get_binary_packages() tr -dC 'A-Z0-9') " if echo "${pkgs_clean}" | grep "${pkg_clean}" \ >/dev/null 2>&1; then - ob_warn "$(ob_get_msg 'duplicate_clean_binary_name')" \ + _ob_warn_msg 'duplicate_clean_binary_name' \ "${pkg_clean}" continue else @@ -201,8 +193,6 @@ ob_get_binary_packages() _OB_BINARY_PACKAGES="$(IFS=' ' echo ${pkgs})" - ob_set_text_domain "${orig_text_domain}" - fi pkgs='' |