Misc enhancements

4 files changed, 16 insertions, 6 deletions

diff --git a/lib/keyringer/actions/ls b/lib/keyringer/actions/ls
index ec8080b..61facc8 100755
--- a/lib/keyringer/actions/ls
+++ b/lib/keyringer/actions/ls
@@ -10,7 +10,10 @@ source "$LIB" || exit 1
 # Aditional parameters
 CWD="`pwd`"
 
-# Run list command
+# Avoid trailing slash
 shift
-cd "$KEYDIR" && ls $*
+ARGS="`echo "$*" | sed -e "s|^/*||"`"
+
+# Run list command
+cd "$KEYDIR" && ls $ARGS
 cd "$CWD"
diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index 7bfa62f..88c85cf 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -46,11 +46,12 @@ _keyringer_git_complete() {
 function _keyringer_path_complete() {
   # Thanks http://unix.stackexchange.com/questions/55520/create-bash-completion-script-to-autocomplete-paths-after-is-equal-sign
   cur=${1//\\ / }
-  [[ ${cur} == "~/"* ]] && cur=${cur/\~/$HOME}
+  [[ ${cur} == "~"* ]] && cur=${cur/\~/$HOME}
 
   echo ${cur}
 }
 
+# Main completion
 _keyringer() {
   # Standard stuff
   local cur prev command config path keyrings instances instance opts
@@ -94,6 +95,7 @@ _keyringer() {
         opts="ls edit"
         ;;
       ls|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|recrypt|open)
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid trailing slash
         opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       genpair)
@@ -104,7 +106,7 @@ _keyringer() {
         ;;
       init)
         cur="$(_keyringer_path_complete ${cur})"
-        opts="$(compgen -o dirnames ${cur})"
+        opts="`compgen -o default "${cur}"`"
         ;;
       *)
         ;;
@@ -112,9 +114,11 @@ _keyringer() {
   elif [ "${#COMP_WORDS[@]}" == "5" ]; then
     case "${command}" in
       recipients)
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid trailing slash
         opts="$(cd $path/config/recipients && ls --color=never -p ${cur}* 2> /dev/null)"
         ;;
       genpair)
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid trailing slash
         opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       git)
@@ -123,7 +127,7 @@ _keyringer() {
         ;;
       encrypt|encrypt-batch)
         cur="$(_keyringer_path_complete ${cur})"
-        opts="$(compgen -o dirnames ${cur})"
+        opts="`compgen -o default "${cur}"`"
         ;;
       *)
         ;;
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index 50ff433..ac31879 100644
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -51,6 +51,7 @@ _keyringer() {
             compadd "$@" ls edit
             ;;
           ls|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|recrypt|open)
+            words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid trailing slash
             compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
             ;;
           genpair)
@@ -69,9 +70,11 @@ _keyringer() {
       misc)
         case "$words[3]" in
           recipients)
+            words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid trailing slash
             compadd "$@" $(cd $keyring_path/config/recipients && ls --color=never -p $words[5]'*' 2> /dev/null)
             ;;
           genpair)
+            words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid trailing slash
             compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]'*' 2> /dev/null)
             ;;
           git)
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index dd31676..7b96d6f 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -59,7 +59,7 @@ function keyringer_has_action {
    exit 1
  fi
 
- if [ -e "$ACTIONS/$1" ]; then
+ if [ -e "$ACTIONS/$1" ] && [ ! -d "$ACTIONS/$1" ]; then
    true
  else
    false