diff options
| -rwxr-xr-x | Makefile | 1 | ||||
| -rw-r--r-- | packaging/debian/changelog | 3 | ||||
| -rw-r--r-- | src/common | 3 | ||||
| -rwxr-xr-x | src/monkeysphere | 5 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 5 |
5 files changed, 16 insertions, 1 deletions
@@ -29,6 +29,7 @@ tarball: clean debian-package: tarball tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz + sed -i "s|__VERSION__|$(MONKEYSPHERE_VERSION)|g" monkeysphere-$(MONKEYSPHERE_VERSION)/src/common cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION) (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us) rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 55f0aaf..45deaab 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -5,8 +5,9 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low functions that require it to be there. - add checks for root users, for functions where it is required. - get rid of getopts. + - added version output option - -- Jameson Graef Rollins <jrollins@finestructure.net> Tue, 16 Dec 2008 15:26:53 -0500 + -- Jameson Graef Rollins <jrollins@finestructure.net> Sun, 28 Dec 2008 15:54:21 -0500 monkeysphere (0.22-1) unstable; urgency=low @@ -19,6 +19,9 @@ SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"} export SYSCONFIGDIR +# monkeysphere version +VERSION=__VERSION__ + ######################################################################## ### UTILITY FUNCTIONS diff --git a/src/monkeysphere b/src/monkeysphere index c003706..98531d2 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -45,6 +45,7 @@ subcommands: --length (-l) BITS key length in bits (2048) --expire (-e) EXPIRE date to expire subkey-to-ssh-agent (s) store authentication subkey in ssh-agent + version (v) show version number help (h,?) this help EOF @@ -365,6 +366,10 @@ case $COMMAND in subkey_to_ssh_agent "$@" ;; + 'version'|'v') + echo "$VERSION" + ;; + '--help'|'help'|'-h'|'h'|'?') usage ;; diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 7d7578d..ba3fa8d 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -66,6 +66,7 @@ subcommands: gpg-authentication-cmd CMD gnupg-authentication command + version (v) show version number help (h,?) this help EOF @@ -1066,6 +1067,10 @@ case $COMMAND in gpg_authentication_cmd "$@" ;; + 'version'|'v') + echo "$VERSION" + ;; + '--help'|'help'|'-h'|'h'|'?') usage ;; |