[pacman-dev] [PATCH 1/6] repo-add: simplify usage message

Allan McRae allan at archlinux.org
Sun Apr 24 07:26:21 EDT 2011


Listing every option on the usage line becomes unweildly as more
options get added so simplify it.  Also, provide a standard package
name in the repo-add example.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/repo-add.sh.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index cb545f3..df9442b 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -66,7 +66,7 @@ usage() {
 	cmd="$(basename $0)"
 	printf "%s (pacman) %s\n\n" "$cmd" "$myver"
 	if [[ $cmd == "repo-add" ]] ; then
-		printf "$(gettext "Usage: repo-add [-d] [-f] [-q] [-s] [-v] <path-to-db> <package|delta> ...\n")"
+		printf "$(gettext "Usage: repo-add [option(s)] <path-to-db> <package|delta> ...\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")"
@@ -74,7 +74,7 @@ Multiple packages to add can be specified on the command line.\n\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 [-q] [-s] [-v] <path-to-db> <packagename|delta> ...\n\n")"
+		printf "$(gettext "Usage: repo-remove [option(s)] <path-to-db> <packagename|delta> ...\n\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\
@@ -87,7 +87,7 @@ packages to remove can be specified on the command line.\n\n")"
 	printf "$(gettext "\n\
 See %s(8) for more details and descriptions of the available options.\n\n")" $cmd
 	if [[ $cmd == "repo-add" ]] ; then
-		echo "$(gettext "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")"
+		echo "$(gettext "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz")"
 	elif [[ $cmd == "repo-remove" ]] ; then
 		echo "$(gettext "Example:  repo-remove /path/to/repo.db.tar.gz kernel26")"
 	fi
-- 
1.7.4.4



More information about the pacman-dev mailing list