diff options
| author | Jason St. John <jstjohn@purdue.edu> | 2013-11-08 08:53:33 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-11-15 02:02:27 +0100 |
| commit | a15fd48016014249a13db7a437b5e4f5937f6158 (patch) | |
| tree | eecd9c3717fcb05d58983ce89f4d3778502f0cc4 /scripts | |
| parent | 7bfaa358ea45c5d527a382bb5fef734b3134bd6f (diff) | |
| download | pacman-a15fd48016014249a13db7a437b5e4f5937f6158.tar.gz pacman-a15fd48016014249a13db7a437b5e4f5937f6158.tar.xz | |
Improve --help switch output for pacman contrib and pacman scripts
Unify the formatting of the --help switch for pacman utils, if it exists.
All of the pacman utils will now output help text using the following
format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does
-f, --foo whatever --foo does
-h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com>
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pacman-db-upgrade.sh.in | 7 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c1c09006..28e8e7a4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2483,6 +2483,8 @@ m4_include(library/parseopts.sh) usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo + printf -- "$(gettext "Make packages compatible for use with pacman")\n" + echo printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "Options:")\n" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c52..2b39538e 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -33,8 +33,11 @@ USE_COLOR='y' m4_include(library/output_format.sh) usage() { - printf "pacman-db-upgrade (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: %s [--nocolor] [pacman_db_root]")\n\n" "$0" + printf "pacman-db-upgrade (pacman) %s\n" "${myver}" + echo + printf -- "$(gettext "Upgrade the local pacman database to a newer format")\n" + echo + printf -- "$(gettext "Usage: %s [--nocolor] [pacman_db_root]")\n" "$0" } version() { diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 39046b87..cc1f9ac2 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -46,11 +46,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { - printf "pkgdelta (pacman) %s\n\n" "$myver" + printf "pkgdelta (pacman) %s\n" "${myver}" + echo printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" + echo printf -- "$(gettext "\ - pkgdelta will create a delta file between two packages.\n\ -This delta file can then be added to a database using repo-add.\n\n")" +pkgdelta will create a delta file between two packages.\n\ +This delta file can then be added to a database using repo-add.\n")" + echo printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" echo printf -- "$(gettext "Options:\n")" @@ -61,7 +64,7 @@ This delta file can then be added to a database using repo-add.\n\n")" } version() { - printf "pkgdelta (pacman) %s\n\n" "$myver" + printf "pkgdelta (pacman) %s\n" "$myver" printf -- "$(gettext "\ Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\n\n\ This is free software; see the source for copying conditions.\n\ |