From 018bddbdbb8239b830301bccde9719cb948c0e4c Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 17 Mar 2014 11:14:50 -0300 Subject: Spell checking as suggested by Debian #741644 --- lib/keyringer/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 832385e..b8e4bc7 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -581,7 +581,7 @@ function keyringer_check_recipient_size { local size=$(echo "$recipient" | wc -c) if (( $size < 41 )); then - echo "Fatal: please set the full GPG signature hash for key ID $recipient:" + echo "Fatal: please set the full OpenPGP fingerprint for key ID $recipient:" cat <<-EOF Please provide a full OpenPGP fingerprint, for example: @@ -671,8 +671,8 @@ function keyringer_check_recipient_key { fi echo "" else - echo "Fatal: no such key $recipient on your GPG keyring." - echo "Please check for this key or fix the recipient file." + echo "Fatal: no such key $recipient on your OpenPGP keyring." + echo "Please retrieve this key yourself or fix the recipient file." exit 1 fi -- cgit v1.2.3 From dccfd2ba85988f52584ad6cb4ff91ab6aa6007bd Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 17 Mar 2014 11:16:04 -0300 Subject: Renaming --prune from git gc --- lib/keyringer/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index b8e4bc7..5936ff0 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -544,7 +544,7 @@ function keyringer_check_repository { # Git maintenance operations echo "Running git maintenance operations..." keyringer_exec git "$BASEDIR" fsck - keyringer_exec git "$BASEDIR" gc --prune=all + keyringer_exec git "$BASEDIR" gc echo "" # Sync the repository -- cgit v1.2.3 From c3cb9ea4b3f65b95001d2ff07e68f7733a3b78a1 Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 17 Mar 2014 18:37:59 -0300 Subject: Spell check --- lib/keyringer/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 5936ff0..42850b9 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -432,7 +432,7 @@ function keyringer_get_file { candidates=(`keyringer_exec find "$BASEDIR" | grep -i "$1" | grep -e '.asc$'`) if [ ! -z "$candidates" ]; then - echo "Could not find exact match \"$1\", please chose one of the following secrets:" + echo "Could not find exact match for \"$1\", please choose one of the following secrets:" echo "" for candidate in ${candidates[@]}; do -- cgit v1.2.3 From c77565e1e2ac774659c125b2ca14f18d9f56f0cf Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 17 Mar 2014 21:10:10 -0300 Subject: Using -iname at find action --- lib/keyringer/actions/find | 2 +- lib/keyringer/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/keyringer/actions/find b/lib/keyringer/actions/find index 9b18d66..21afc7a 100755 --- a/lib/keyringer/actions/find +++ b/lib/keyringer/actions/find @@ -15,5 +15,5 @@ shift ARGS="`echo "$*" | sed -e "s|^/*||"`" # Run find command -cd "$KEYDIR/$RELATIVE_PATH" && find | grep -i "$ARGS" | sed -e 's|^./||g' +cd "$KEYDIR/$RELATIVE_PATH" && find -iname "*$ARGS*" | sed -e 's|^./||g' cd "$CWD" diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 42850b9..7840b04 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -429,7 +429,7 @@ function keyringer_get_file { elif [ ! -f "$KEYDIR/$FILE" ]; then # Try to find a similar file count=0 - candidates=(`keyringer_exec find "$BASEDIR" | grep -i "$1" | grep -e '.asc$'`) + candidates=(`keyringer_exec find "$BASEDIR" "$1*.asc"`) if [ ! -z "$candidates" ]; then echo "Could not find exact match for \"$1\", please choose one of the following secrets:" -- cgit v1.2.3 From 82ec9c59d31a429335d1f953927775a80bb10808 Mon Sep 17 00:00:00 2001 From: rhatto Date: Sat, 22 Mar 2014 16:42:28 -0300 Subject: Use --recv-keys instead of --refresh-keys and minor text change --- lib/keyringer/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 7840b04..e2d23ac 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -572,7 +572,7 @@ function keyringer_refresh_keys { local recipient="$1" echo "Trying to refresh key $recipient..." - gpg --batch --refresh-keys "$recipient" + gpg --batch --recv-keys "$recipient" } # Check recipient size @@ -671,7 +671,7 @@ function keyringer_check_recipient_key { fi echo "" else - echo "Fatal: no such key $recipient on your OpenPGP keyring." + echo "Fatal: no such key $recipient on your GnuPG keyring." echo "Please retrieve this key yourself or fix the recipient file." exit 1 -- cgit v1.2.3 From fc9954384ee5543d742395c5b9245e83d6e9fd07 Mon Sep 17 00:00:00 2001 From: rhatto Date: Sat, 22 Mar 2014 16:47:22 -0300 Subject: Keyringer 0.3.3 --- ChangeLog | 10 ++++++++++ keyringer | 2 +- lib/keyringer/functions | 1 - share/man/keyringer.1 | 8 ++++---- 4 files changed, 15 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/ChangeLog b/ChangeLog index 6d53db7..5b1c53e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-03-22 - 0.3.3 - Silvio Rhatto + + Use --recv-keys instead of --refresh-keys + + Use -iname at find action + + Removing --prune from git gc + + Spell checking as suggested by Debian #741644 + 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 7ea9752..6a1eda5 100755 --- a/keyringer +++ b/keyringer @@ -138,7 +138,7 @@ function keyringer_dispatch { # Config NAME="keyringer" -KEYRINGER_VERSION="0.3.2" +KEYRINGER_VERSION="0.3.3" CONFIG_VERSION="0.1" CONFIG_BASE="$HOME/.$NAME" CONFIG="$CONFIG_BASE/config" diff --git a/lib/keyringer/functions b/lib/keyringer/functions index e2d23ac..f1af951 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -652,7 +652,6 @@ function keyringer_check_recipients { # Check key expiration keyringer_check_expiration "$recipient" - done } diff --git a/share/man/keyringer.1 b/share/man/keyringer.1 index 29c618b..f460cbf 100644 --- a/share/man/keyringer.1 +++ b/share/man/keyringer.1 @@ -16,8 +16,8 @@ It also supports encryption to multiple recipients and groups of recipients, to allow a workgroup to share access to a single repository while restricting some secrets to subsets of the group. .PP -Secrets are encrypted using GPG and added to a Git tree so that they can -be synced with remote branches later. +Secrets are encrypted using OpenPGP and added to a Git tree so that they +can be synced with remote branches later. .SH ACTIONS .PP Keyringer has three types of actions: @@ -219,7 +219,7 @@ password-store convention. .RE .TP .B xclip <\f[I]secret\f[]> -Alis to clip action. +Alias to clip action. .RS .RE .SH CONFIGURATION ACTIONS @@ -286,7 +286,7 @@ file\f[C]$KEYRING_FOLDER/config/recipients/accounting\f[]. .PP Each line in a recipients file has entries in the format \[aq]john\@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\[aq], where -\f[I]john\@doe.com\f[] is an alias for the GPG public key whose +\f[I]john\@doe.com\f[] is an alias for the OpenPGP public key whose fingerprint is \f[I]XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.\f[] .PP All lines starting with the hash (#) character are interpreted as -- cgit v1.2.3