From a77e638c773d8a492f8c48e8c15474030a7e3d71 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 12 Dec 2011 22:36:57 +0100 Subject: 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 Signed-off-by: Dan McGee --- contrib/pacscripts.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib/pacscripts.in') diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 967f7826..84687145 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -25,7 +25,7 @@ set -o nounset set -o errexit declare -r myname='pacscripts' -progver="0.4" +declare -r myver='@PACKAGE_VERSION@' conf="@sysconfdir@/pacman.conf" @@ -57,6 +57,12 @@ usage() { echo "Example: $myname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" } +version() { + printf "%s %s\n" "$myname" "$myver" + echo 'Copyright (c) 2009 Giulio "giulivo" Fidente ' + echo 'Copyright (c) 2009 Xavier Chantry ' +} + spacman() { if [ $EUID -eq 0 ]; then pacman "$@" @@ -127,6 +133,6 @@ fi case "$1" in --help|-h) usage; exit 0 ;; - --version|-v) echo "$myname version $progver"; exit 0 ;; + --version|-V) version; exit 0 ;; *) print_scriptlet $1 ;; esac -- cgit v1.2.3-54-g00ecf