summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@ratatosk.fluxo.info>2014-03-14 13:52:01 -0300
committerrhatto <rhatto@ratatosk.fluxo.info>2014-03-14 13:52:01 -0300
commit3161a62dc3d83be2f42d916ebbbf56d6c51d7774 (patch)
treedd8057a3f7619295cd68ebbd1b6bdf29219d2a7a
parentdc6d68e2386f0e700bcf1d6e3171e9237e4ad9b3 (diff)
parent307fadff79b8f725d4ab9e41f270c024c05a0ef9 (diff)
downloadkeyringer-3161a62dc3d83be2f42d916ebbbf56d6c51d7774.tar.gz
keyringer-3161a62dc3d83be2f42d916ebbbf56d6c51d7774.tar.bz2
Merge tag 'upstream_keyringer_0.3.2' into debian
Upstream version 0.3.2
-rw-r--r--ChangeLog8
-rwxr-xr-xkeyringer2
l---------lib/keyringer/actions/destroy1
-rwxr-xr-xlib/keyringer/functions16
-rw-r--r--share/man/keyringer.15
-rw-r--r--share/man/keyringer.1.mdwn3
6 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6730f39..6d53db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-14 - 0.3.2 - Silvio Rhatto <rhatto@riseup.net>
+
+ Subkey expiration date check shall not happen with expired keys
+
+ Make usage more readable
+
+ Added "destroy" alias to "teardown" action
+
2014-03-14 - 0.3.1 - Silvio Rhatto <rhatto@riseup.net>
Try to get an initial recipient (#32)
diff --git a/keyringer b/keyringer
index dd6e828..7ea9752 100755
--- a/keyringer
+++ b/keyringer
@@ -138,7 +138,7 @@ function keyringer_dispatch {
# Config
NAME="keyringer"
-KEYRINGER_VERSION="0.3.1"
+KEYRINGER_VERSION="0.3.2"
CONFIG_VERSION="0.1"
CONFIG_BASE="$HOME/.$NAME"
CONFIG="$CONFIG_BASE/config"
diff --git a/lib/keyringer/actions/destroy b/lib/keyringer/actions/destroy
new file mode 120000
index 0000000..c523618
--- /dev/null
+++ b/lib/keyringer/actions/destroy
@@ -0,0 +1 @@
+teardown \ No newline at end of file
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 0b084af..832385e 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -519,14 +519,18 @@ function keyringer_usage {
printf "Keyringer $KEYRINGER_VERSION\n"
printf "Usage: %s <keyring> <action> [arguments]\n\n" "$BASENAME"
- printf "Available actions: \n\n"
- keyringer_show_actions | sed -e 's/^/\t/'
# Display only when not in a keyring context
if [ ! -z "$keyrings" ] && [ -z "$1" ]; then
- printf "\tinit <path> [remote]\n\n" $BASENAME
printf "Available keyrings: %s \n" "$keyrings"
fi
+
+ # Show available actions
+ printf "Available actions: \n\n"
+ if [ ! -z "$keyrings" ] && [ -z "$1" ]; then
+ printf "\tinit <path> [remote]\n" $BASENAME
+ fi
+ keyringer_show_actions | sed -e 's/^/\t/'
}
# Check repository integrity
@@ -707,10 +711,10 @@ function keyringer_check_expiration {
for expiry in `gpg --with-colons --fixed-list-mode --list-keys "$recipient" | grep ^sub | cut -d : -f 7`; do
if [[ "$seconds" -lt "$expiry" ]]; then
not_expired="1"
- fi
- if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
- echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+ if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
+ echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+ fi
fi
done
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 9d2eae8..29c618b 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -50,6 +50,11 @@ Also, an entry will be added to \f[C]$HOME/.keyringer/config\f[]
allowing keyringer to find the keyring by its alias.
.RE
.TP
+.B destroy
+Alias for \f[I]teardown\f[] action.
+.RS
+.RE
+.TP
.B git <\f[I]action\f[]> <\f[I]options\f[]>
Git wrapper that operates from the toplevel keyring repository.
You can issue any \f[I]GIT(1)\f[] subcommand with this action to have it
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 9412b5d..84895c2 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -50,6 +50,9 @@ init <*path*> [*remote*]
Also, an entry will be added to `$HOME/.keyringer/config` allowing keyringer to
find the keyring by its alias.
+destroy
+: Alias for *teardown* action.
+
git <*action*> <*options*>
: Git wrapper that operates from the toplevel keyring repository. You can issue any
*GIT(1)* subcommand with this action to have it applied in the keyring repository.