From 4bc7803e03e60345c3a70dac2c50020181c6a881 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:33:33 -0300 Subject: Added "destroy" alias to "teardown" action --- ChangeLog | 4 ++++ lib/keyringer/actions/destroy | 1 + share/man/keyringer.1.mdwn | 3 +++ 3 files changed, 8 insertions(+) create mode 120000 lib/keyringer/actions/destroy diff --git a/ChangeLog b/ChangeLog index 6730f39..1e8234a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-14 - Silvio Rhatto + + Added "destroy" alias to "teardown" action + 2014-03-14 - 0.3.1 - Silvio Rhatto Try to get an initial recipient (#32) 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/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. -- cgit v1.2.3 From c26e7a4cb2b5b88bca604ed9a0fb16bfc10b20b4 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:37:51 -0300 Subject: Make usage more readable --- lib/keyringer/functions | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 0b084af..e0cccec 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -519,14 +519,18 @@ function keyringer_usage { printf "Keyringer $KEYRINGER_VERSION\n" printf "Usage: %s [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 [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 [remote]\n" $BASENAME + fi + keyringer_show_actions | sed -e 's/^/\t/' } # Check repository integrity -- cgit v1.2.3 From bffd44cdc3d22b940517c66b736a691bd01f80fa Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:38:48 -0300 Subject: ChangeLog update --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1e8234a..0f7cf22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-14 - Silvio Rhatto + Make usage more readable + Added "destroy" alias to "teardown" action 2014-03-14 - 0.3.1 - Silvio Rhatto -- cgit v1.2.3 From 68e1e1b26bf220e0a5dde780cd6437d9965df89c Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:48:18 -0300 Subject: Subkey expiration date check shall not happen with expired keys --- lib/keyringer/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/keyringer/functions b/lib/keyringer/functions index e0cccec..832385e 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -711,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 -- cgit v1.2.3 From 59937cdcfb937abbf3f9601c37ab83384c45f289 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:50:36 -0300 Subject: ChangeLog update --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0f7cf22..00fa765 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-14 - Silvio Rhatto + Subkey expiration date check shall not happen with expired keys + Make usage more readable Added "destroy" alias to "teardown" action -- cgit v1.2.3 From 04fddd908235729af70447fecf143af9e669abad Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:51:39 -0300 Subject: Keyringer 0.3.2 --- ChangeLog | 2 +- keyringer | 2 +- share/man/keyringer.1 | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00fa765..6d53db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2014-03-14 - Silvio Rhatto +2014-03-14 - 0.3.2 - Silvio Rhatto Subkey expiration date check shall not happen with expired keys 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/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 -- cgit v1.2.3