diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | lib/keyringer/functions | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,7 @@ 2014-02-23 - Silvio Rhatto <rhatto@riseup.net> + Enhanced secret finder at keyringer_get_file + Added find action into shell completions Using XA_PRIMARY selection at xclip action diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 014c2c9..475514d 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -413,11 +413,10 @@ function keyringer_get_file { elif [ ! -f "$KEYDIR/$FILE" ]; then # Try to find a similar file count=0 - candidates=(`keyringer_exec find "$BASEDIR" "$1" | grep -e '.asc$'`) + 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" - echo "of the following secrets:" + echo "Could not find exact match \"$1\", please chose one of the following secrets:" echo "" for candidate in ${candidates[@]}; do @@ -426,7 +425,7 @@ function keyringer_get_file { done echo "" - read -p "Enter option: " option + read -p "Enter option (Ctrl-C to abort): " option if [[ "$option" =~ ^[0-9]+$ ]] && [ ! -z "${candidates[$option]}" ]; then FILE="$(keyringer_filename "$RELATIVE_PATH/${candidates[$option]}")" |