[pacman-dev] [PATCH v8 05/12] bacman: rewrite usage function

Allan McRae allan at archlinux.org
Tue Sep 20 13:43:55 UTC 2016


On 05/09/16 02:14, Gordian Edenhofer wrote:
> Signed-off-by: Gordian Edenhofer <gordian.edenhofer at gmail.com>
> ---
>  contrib/bacman.sh.in | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
> index e56f31b..5045d6e 100644
> --- a/contrib/bacman.sh.in
> +++ b/contrib/bacman.sh.in
> @@ -48,13 +48,21 @@ trap clean_up SIGHUP SIGINT SIGTERM
>  # User Friendliness
>  #
>  usage() {
> -	echo "${myname} (pacman) v${myver}"
> +	printf "%s (pacman) %s\n" "$myname" "$myver"
>  	echo
> -	echo "Recreate a package using pacman's database and system files"
> +	printf -- "$(gettext "Recreate packages using pacman's database and system files")\n"
>  	echo
> -	echo "Usage: ${myname} [--nocolor] [--pacnew] <installed package name>"
> +	printf -- "$(gettext "Usage: %s [options] <package(s)>")\n" "$0"
> +	echo
> +	printf -- "$(gettext "Options:")\n"
> +	printf -- "$(gettext "  -h, --help       Show this help message and exit")\n"
> +	printf -- "$(gettext "  -m, --nocolor    Disable colorized output messages")\n"
> +	printf -- "$(gettext "  --pacnew         Package .pacnew files")\n"
> +	echo
> +	printf -- "$(gettext "Examples:  %s linux-headers")\n" "$myname"

Moved "Examples:" to its own line for formatting for later examples to
be consistent.

Removed gettext calls to non-translatable examples

> +	printf -- "$(gettext "  %s --nocolor --pacnew gzip munge binutils")\n" "$myname"
> +	printf -- "$(gettext "  %s \$(pacman -Qsq)")\n" "$myname"

Minor modification...  Changed -Qsq to -Qq


>  	echo
> -	echo "Example: ${myname} linux-headers"
>  }
>  
>  version() {
> 


More information about the pacman-dev mailing list