diff options
Diffstat (limited to 'functions/echo.sh')
-rwxr-xr-x | functions/echo.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/functions/echo.sh b/functions/echo.sh index 808cd0e89..d865ddb02 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -12,57 +12,60 @@ set -e Echo_debug () { STRING="${1}" + shift if [ "${LH_DEBUG}" = "enabled" ] then - echo "D: ${STRING}" + printf "D: $(eval_gettext "${STRING}")" "${@}"; echo; fi } Echo_error () { STRING="${1}" + shift - echo "E: ${STRING}" >&2 + (printf "E: $(eval_gettext "${STRING}")" "${@}"; echo;) >&2 } Echo_message () { STRING="${1}" + shift if [ "${LH_QUIET}" != "enabled" ] then - echo "P: ${STRING}" + printf "P: $(eval_gettext "${STRING}")" "${@}"; echo; fi } Echo_verbose () { STRING="${1}" + shift if [ "${LH_VERBOSE}" = "enabled" ] then - echo "I: ${STRING}" + printf "I: $(eval_gettext "${STRING}")" "${@}"; echo; fi } Echo_warning () { STRING="${1}" + shift - echo "W: ${STRING}" + printf "W: $(eval_gettext "${STRING}")" "${@}"; echo; } Echo_breakage () { - Echo_message "If the following stage fails, the most likely cause of the problem is with" - case "${LH_DISTRIBUTION}" in sid|unstable) - Echo_message "your mirror configuration, a caching proxy or the sid distribution." + Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution." ;; *) - Echo_message "your mirror configuration or a caching proxy." + Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration or a caching proxy." ;; esac |