summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-11-14 19:01:33 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-11-14 19:01:33 -0200
commit02fd4b1ffc1e57ae393b765dc4451b66d21b6238 (patch)
tree8e0f1443adcd3ffc7f740d8a8529b81dc975654c
parent96a4a07c598b26987ed29fbae3cd721f199b6113 (diff)
downloadkeyringer-02fd4b1ffc1e57ae393b765dc4451b66d21b6238.tar.gz
keyringer-02fd4b1ffc1e57ae393b765dc4451b66d21b6238.tar.bz2
Keyringer 0.2.80.2.8
-rw-r--r--ChangeLog4
-rw-r--r--Makefile2
-rw-r--r--development.mdwn3
-rwxr-xr-xkeyringer2
-rwxr-xr-xlib/keyringer/functions1
5 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b66f924..69d58bb 100644
--- 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 0182482..0d2ef3a 100644
--- 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 bf04ff6..cfedb4b 100644
--- 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 7aad6a0..bdb1f6c 100755
--- 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 7570a94..4c06198 100755
--- 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/'