Keyringer 0.2.8

diff --git a/ChangeLog b/ChangeLog
index b66f9242859c2113858cfd510aee53d1ca0ae682..69d58bbee8b5a4770a709256bf91297f15aee97f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-14 - 0.2.8 Silvio Rhatto  <rhatto@riseup.net>
+
+       Updated development workflow and version scheme
+
 2013-11-14 - 0.2.7 Silvio Rhatto  <rhatto@riseup.net>
 
        Ramdisk check for temporary folders (closes #13)

diff --git a/Makefile b/Makefile
index 0182482bb51d55d1214b6a4dd2121d1f5c08cdcd..0d2ef3afc3b2c110f99b641542cfb36adb7e2f66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 #
 
 PACKAGE = keyringer
-VERSION = 0.2.7
+VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2)
 PREFIX ?= /usr/local
 INSTALL = /usr/bin/install
 

diff --git a/development.mdwn b/development.mdwn
index bf04ff6c830de017b59655329f7716202677032f..cfedb4b1bbeddf8cbdfce5b33b13cc46f5be6f9c 100644 (file)
--- a/development.mdwn
+++ b/development.mdwn
@@ -46,12 +46,13 @@ Go to master branch
 
 Prepare the source code:
 
+    $EDITOR keyringer # and update KEYRINGER_VERSION
     $EDITOR ChangeLog
     make build_man
 
 Commit and tag a release:
 
-    VERSION="X.Y.Z"
+    VERSION="`./keyringer | head -n 1 | cut -d ' ' -f 2`"
     git commit -a -m "Keyringer $VERSION"
     git tag -s $VERSION -m "Keyringer $VERSION"
 

diff --git a/keyringer b/keyringer
index 7aad6a08a87a8b4cd994bbf35cf76aeba7524f27..bdb1f6ce9dfef0af3efac770029165ef65cb0b28 100755 (executable)
--- a/keyringer
+++ b/keyringer
@@ -119,7 +119,7 @@ function keyringer_dispatch {
 
 # Config
 NAME="keyringer"
-KEYRINGER_VERSION="0.2.6"
+KEYRINGER_VERSION="0.2.8"
 CONFIG_VERSION="0.1"
 CONFIG_BASE="$HOME/.$NAME"
 CONFIG="$CONFIG_BASE/config"

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 7570a94238c84c65d9f4f2350b64c5a8e699520c..4c061987721fd0e5705368cfecb6cdf9b9ce5368 100755 (executable)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -482,6 +482,7 @@ function keyringer_show_actions {
 function keyringer_usage {
   local keyrings="$(ls --color=never `dirname $CONFIG` | sed -e 's/config//' | xargs)"
 
+  printf "Keyringer $KEYRINGER_VERSION\n"
   printf "Usage: %s <keyring> <action> [arguments]\n\n" "$BASENAME"
   printf "Available commands: \n\n"
   keyringer_show_actions | sed -e 's/^/\t/'