diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-12-12 22:36:57 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-12-23 21:49:46 +0100 |
| commit | a77e638c773d8a492f8c48e8c15474030a7e3d71 (patch) | |
| tree | ad13d9931fc9e88ba39e7356ca79cfd619014415 /contrib/pacdiff.in | |
| parent | cd75ae46ab10fe295c5a3d3054a3b17eff31122a (diff) | |
| download | pacman-a77e638c773d8a492f8c48e8c15474030a7e3d71.tar.gz pacman-a77e638c773d8a492f8c48e8c15474030a7e3d71.tar.xz | |
contrib/*: Support the "--help" and "--version" options
Add "--help"/"-h" and "--version"/"-V" support to all contrib scripts.
Also, update scripts that used "-v" as a short option for "--version"
and use "-V" for the sake of consistency.
Additionally:
* Move version and usage messages to separate convenience functions in
all scripts.
* Add a workaround to paccache to support "--help" and "--version". This
should be replaced by a proper POSIX-compliant command line parser
that supports long options in a future patch.
* Add a "$myver" variable to all scripts and use it whenever we refer to
the program version (e.g. in version messages). Also, use the pacman
version number everywhere instead of using a different versioning
scheme for each contrib script. This is achieved by adding a
"PACKAGE_VERSION" placeholder that is replaced by sed(1) when the
script is built.
* Ensure we always return with exit status 0 if "--help" is used and
return with exit status 1 if we display the usage message due to
invalid arguments.
* Add "AUTOMAKE_OPTIONS = std-options" and add all scripts to
"bin_SCRIPTS" to make `make installcheck` check that installed scripts
actually support the "--help" and "--version" options.
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib/pacdiff.in')
| -rwxr-xr-x | contrib/pacdiff.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 79cf809d..bfafda26 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -18,6 +18,7 @@ # declare -r myname='pacdiff' +declare -r myver='@PACKAGE_VERSION@' diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} @@ -32,6 +33,11 @@ usage() { echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" $myname" } +version() { + printf "%s %s\n" "$myname" "$myver" + echo 'Copyright (C) 2007 Aaron Griffin <aaronmgriffin@gmail.com>' +} + cmd() { if [ $locate -eq 1 ]; then locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave @@ -44,8 +50,12 @@ if [ $# -gt 0 ]; then case $1 in -l|--locate) locate=1;; - *) + -V|--version) + version; exit 0;; + -h|--help) usage; exit 0;; + *) + usage; exit 1;; esac fi |