summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-09-04 22:00:36 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-09-04 22:00:36 (EDT)
commit5116e84e22608d055a3e7bbffdca2e857264c84f (patch)
treedff99b8cd5821dacc1fbdde42a351405093d41f5
parent97c59d2c93b7fd64dc46da8ce42427e9a74de98c (diff)
Move and partially rewrite output library module.
-rw-r--r--lib/output.sh (renamed from lib/messages.sh)66
1 files changed, 21 insertions, 45 deletions
diff --git a/lib/messages.sh b/lib/output.sh
index 5a2139f..f5bfd34 100644
--- a/lib/messages.sh
+++ b/lib/output.sh
@@ -1,6 +1,6 @@
-# opkhelper
-# lib/messages
-# Functions for printing error and warning messages.
+# opkbuild
+# lib/output
+# Functions for printing messages.
#
# Copyright (C) 2012 Patrick "P. J." McDermott
#
@@ -17,69 +17,45 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-[ -n "${_OH_MESSAGES_SH}" ] && return 0
-_OH_MESSAGES_SH=true
+[ -n "${_OB_MESSAGES_SH}" ] && return 0
+_OB_MESSAGES_SH=true
-. @@LIBDIR@@/locale
+. @@LIBOPKBUILD@@/locale.sm
# TODO: Which of these should print to the standard error stream – just
-# oh_error() and oh_warn()?
+# ob_error() and ob_warn()?
-oh_error()
+ob_error()
{
printf '%s: Error: ' "${0##*/}"
printf "${@}"
printf '\n'
+
exit 1
}
-oh_warn()
+ob_warn()
{
+ if [ ${#} -eq 0 ]; then
+ return 125
+ fi
+
printf '%s: Warning: ' "${0##*/}"
printf "${@}"
printf '\n'
+
return 0
}
-oh_info()
+ob_info()
{
+ if [ ${#} -eq 0 ]; then
+ return 125
+ fi
+
printf '%s: ' "${0##*/}"
printf "${@}"
printf '\n'
- return 0
-}
-
-oh_usage()
-{
- _util="$(echo "${0##*/}" | sed 's/-/_/g')"
-
- # Prevent field splitting in the evaluated echo command.
- _old_ifs="${IFS}"
- IFS=
- _usage_str="$(eval echo \$\{oh_str_usage_"${_util}"\})"
- IFS="${_old_ifs}"
- : "${_usage_str:=${oh_str_usage_none}}"
- printf '%s\n' "${_usage_str}"
-}
-
-oh_help()
-{
- _util="$(echo "${0##*/}" | sed 's/-/_/g')"
-
- # Prevent field splitting in the evaluated echo command.
- _old_ifs="${IFS}"
- IFS=
- _help_str="$(eval echo \$\{oh_str_help_"${_util}"\})"
- IFS="${_old_ifs}"
- : "${_help_str:=${oh_str_help_none}}"
-
- oh_usage
- printf '%s\n' "${_help_str}"
-}
-
-oh_version()
-{
- printf "${oh_str_version}\n" \
- "${0##*/}" '@@PACKAGE_NAME@@' '@@PACKAGE_VERSION@@'
+ return 0
}