summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorAntonio Terceiro <terceiro@softwarelivre.org>2008-11-13 11:00:42 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:44 +0100
commit5f0876d99d8c213c095cf61b70bb2b84f78def3d (patch)
treed034b4fd1779b47b02c2e6fd0ed6532ee49fc7e9 /functions
parent7a5c748b83b6568741d0228763cf0a6c47304693 (diff)
downloadlive-build-5f0876d99d8c213c095cf61b70bb2b84f78def3d.zip
live-build-5f0876d99d8c213c095cf61b70bb2b84f78def3d.tar.gz
Adding missing arguments to printf (l10n disabled)
Otherwise the extra arguments would be discarded, e.g. Echo "Loading defaults from %s" "${DEFAULTS_DIR}"
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/echo.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/functions/echo.sh b/functions/echo.sh
index 3413593..9d828b8 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -14,7 +14,7 @@ Echo ()
if [ "${_L10N}" = "false" ]
then
- printf "${STRING}\n"
+ printf "${STRING}\n" "${@}"
else
printf "$(eval_gettext "${STRING}")" "${@}"; echo;
fi
@@ -29,7 +29,7 @@ Echo_debug ()
if [ "${_L10N}" = "false" ]
then
- printf "D: ${STRING}\n"
+ printf "D: ${STRING}\n" "${@}"
else
printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
fi
@@ -45,7 +45,7 @@ Echo_debug_running ()
if [ "${_L10N}" = "false" ]
then
- printf "D: ${STRING}"
+ printf "D: ${STRING}" "${@}"
else
printf "D: $(eval_gettext "${STRING}")" "${@}"
fi
@@ -73,7 +73,7 @@ Echo_error ()
if [ "${_L10N}" = "false" ]
then
- printf " ${STRING}" >&2
+ printf " ${STRING}" "${@}" >&2
else
(printf " $(eval_gettext "${STRING}")" "${@}";) >&2
fi
@@ -95,7 +95,7 @@ Echo_message ()
if [ "${_L10N}" = "false" ]
then
- printf " ${STRING}\n"
+ printf " ${STRING}\n" "${@}"
else
printf " $(eval_gettext "${STRING}")" "${@}"; echo;
fi
@@ -118,7 +118,7 @@ Echo_message_running ()
if [ "${_L10N}" = "false" ]
then
- printf " ${STRING}"
+ printf " ${STRING}" "${@}"
else
printf " $(eval_gettext "${STRING}")" "${@}";
fi
@@ -141,7 +141,7 @@ Echo_verbose ()
if [ "${_L10N}" = "false" ]
then
- printf "I: ${STRING}\n"
+ printf "I: ${STRING}\n" "${@}"
else
printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
fi
@@ -157,7 +157,7 @@ Echo_verbose_running ()
if [ "${_L10N}" = "false" ]
then
- printf "I: ${STRING}"
+ printf "I: ${STRING}" "${@}"
else
printf "I: $(eval_gettext "${STRING}")" "${@}";
fi
@@ -185,7 +185,7 @@ Echo_warning ()
if [ "${_L10N}" = "false" ]
then
- printf " ${STRING}\n"
+ printf " ${STRING}\n" "${@}"
else
printf " $(eval_gettext "${STRING}")" "${@}"; echo;
fi