From 430b0df7794815049f37f38df39c71e1a9e9c157 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 12 Jan 2012 09:32:19 -0600 Subject: repo-add: clean up help messages Use consistent blank lines across all commands, get rid of the translated double newlines which only serve to confuse translators, and fix -h/--help for that extra special third command this script offers. Signed-off-by: Dan McGee --- scripts/repo-add.sh.in | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4708086c..6a10a684 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -48,30 +48,38 @@ usage() { printf "%s (pacman) %s\n\n" "$cmd" "$myver" if [[ $cmd == "repo-add" ]] ; then printf "$(gettext "Usage: repo-add [options] ...\n")" + printf "\n" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ -Multiple packages to add can be specified on the command line.\n\n")" +Multiple packages to add can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" printf "$(gettext " -d, --delta generate and add delta for package update\n")" printf "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then - printf "$(gettext "Usage: repo-remove [options] ...\n\n")" + printf "$(gettext "Usage: repo-remove [options] ...\n")" + printf "\n" printf "$(gettext "\ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ -packages to remove can be specified on the command line.\n\n")" +packages to remove can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" + else + printf "$(gettext "Please move along, there is nothing to see here.\n")" + return fi printf "$(gettext " -q, --quiet minimize output\n")" printf "$(gettext " -s, --sign sign database with GnuPG after update\n")" printf "$(gettext " -k, --key use the specified key to sign the database\n")" printf "$(gettext " -v, --verify verify database's signature before update\n")" printf "$(gettext "\n\ -See %s(8) for more details and descriptions of the available options.\n\n")" $cmd +See %s(8) for more details and descriptions of the available options.\n")" $cmd + printf "\n" if [[ $cmd == "repo-add" ]] ; then - echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz")" + printf "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\n")" elif [[ $cmd == "repo-remove" ]] ; then - echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" + printf "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26\n")" fi } -- cgit v1.2.3-24-g4f1b