help/usage: avoid unnecessary use of echo helpers

Closes: #952877
This commit is contained in:
jnqnfe 2015-01-06 03:10:43 +00:00 committed by Luca Boccassi
parent 5a00487872
commit d0eb72a5ef
2 changed files with 13 additions and 21 deletions

View File

@ -10,27 +10,22 @@
Help ()
{
Echo "%s - %s" "${PROGRAM}" "${DESCRIPTION}"
echo
Echo "Usage:"
echo
printf "%s - %s\n\n" "${PROGRAM}" "${DESCRIPTION}"
printf "Usage:\n\n"
if [ -n "${USAGE}" ]
then
Echo "${USAGE}"
echo
printf "%s\n" "${USAGE}"
fi
Echo " %s [-h|--help]" "${PROGRAM}"
Echo " %s [-u|--usage]" "${PROGRAM}"
Echo " %s [-v|--version]" "${PROGRAM}"
echo
printf " %s [-h|--help]\n" "${PROGRAM}"
printf " %s [-u|--usage]\n" "${PROGRAM}"
printf " %s [-v|--version]\n\n" "${PROGRAM}"
if [ -n "${HELP}" ]
then
Echo "${HELP}"
echo
printf "%s\n\n" "${HELP}"
fi
Echo "Report bugs to the Live Systems project <https://wiki.debian.org/DebianLive>."
echo "Report bugs to the Live Systems project <https://wiki.debian.org/DebianLive>."
exit 0
}

View File

@ -10,22 +10,19 @@
Usage ()
{
printf "%s - %s\n" "${PROGRAM}" "${DESCRIPTION}"
echo
Echo "Usage:"
echo
printf "%s - %s\n\n" "${PROGRAM}" "${DESCRIPTION}"
printf "Usage:\n\n"
if [ -n "${USAGE}" ]
then
Echo " ${USAGE}"
echo
printf " %s\n" "${USAGE}"
fi
printf " %s [-h|--help]\n" "${PROGRAM}"
printf " %s [-u|--usage]\n" "${PROGRAM}"
printf " %s [-v|--version]\n" "${PROGRAM}"
echo
Echo "Try \"%s --help\" for more information." "${PROGRAM}"
printf "\nTry \"%s --help\" for more information.\n" "${PROGRAM}"
exit 1
}