From dee97a0629659ed8e2c8a716611e88a9bb7f068d Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 14 Mar 2014 10:28:28 -0300 Subject: Use 'actions' instead of 'commands' --- lib/keyringer/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/keyringer') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index e60657a..ca7f411 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -519,7 +519,7 @@ function keyringer_usage { printf "Keyringer $KEYRINGER_VERSION\n" printf "Usage: %s [arguments]\n\n" "$BASENAME" - printf "Available commands: \n\n" + printf "Available actions: \n\n" keyringer_show_actions | sed -e 's/^/\t/' # Display only when not in a keyring context -- cgit v1.2.3 From 927a8392b30b2329b60f181fb0a67bd450f6df4e Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 14 Mar 2014 13:23:04 -0300 Subject: Try to get an initial recipient (#32) --- lib/keyringer/functions | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'lib/keyringer') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index ca7f411..0b084af 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -772,10 +772,35 @@ function keyringer_set_new_recipients { # Create a new recipients file function keyringer_create_new_recipients { - if [ ! -e "$1" ]; then - mkdir -p "`dirname $1`" + local recipients="$1" + local recipient + local key + local uid + local fpr + + if [ ! -e "$recipients" ]; then + mkdir -p "`dirname $recipients`" echo "# Use entries in the form of 'john@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'" > "$1" - echo "" >> "$1" + echo "" >> "$recipients" + + # Try to get an initial recipient + if [ -e "$HOME/.gnupg/gpg.conf" ]; then + recipient="`grep -e "^default-key" ~/.gnupg/gpg.conf | cut -d ' ' -f 2`" + + if [ ! -z "$recipient" ]; then + key="`gpg --fingerprint --with-colons $recipient 2> /dev/null`" + + if [ "$?" == "0" ]; then + fpr="`echo "$key" | grep -e '^fpr:' | head -1 | cut -d : -f 10`" + uid="`echo "$key" | grep -e '^uid:' | head -1 | cut -d : -f 10 | sed -e 's|^[^<]*<||' -e 's|>$||'`" + + if [ ! -z "$uid" ] && [ ! -z "$fpr" ]; then + echo "Default key $fpr ($uid) found at ~/.gnupg/gpg.conf, using as initial recipient." + echo "$uid $fpr" >> "$recipients" + fi + fi + fi + fi fi } -- cgit v1.2.3 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 (limited to 'lib/keyringer') 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(-) (limited to 'lib/keyringer') 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 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(-) (limited to 'lib/keyringer') 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