From e27e658033d500c22b9dd4974fa3fbcc378f35b9 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 13 Jun 2011 22:36:41 +1000 Subject: parse_options: adjust error messages Provide consistent error messages for unknown long and short options. Also get full string translation for the messages. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/library/parse_options.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh index 32aa0bee..8057c288 100644 --- a/scripts/library/parse_options.sh +++ b/scripts/library/parse_options.sh @@ -25,7 +25,7 @@ parse_options() { shift printf " '%s'" "$1" else - echo "@SCRIPTNAME@: option '$1' $(gettext "requires an argument")" >&2 + printf "@SCRIPTNAME@: $(gettext "option %s requires an argument")" "'$1'" >&2 ret=1 fi fi @@ -50,7 +50,7 @@ parse_options() { shift printf " '%s'" "${1}" else - echo "@SCRIPTNAME@: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 + printf "@SCRIPTNAME@: $(gettext "option %s requires an argument")" "'-${1:i:1}'" >&2 ret=1 fi fi @@ -59,7 +59,7 @@ parse_options() { printf ' -%s' "${1:i:1}" fi else - echo "@SCRIPTNAME@: $(gettext "invalid option") -- '${1:i:1}'" >&2 + echo "@SCRIPTNAME@: $(gettext "unrecognized option") '-${1:i:1}'" >&2 ret=1 fi done -- cgit v1.2.3-70-g09d2