]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Typo: 'trailing slash' was meant to be 'leading slash'
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 26 Nov 2013 00:19:46 +0000 (22:19 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 26 Nov 2013 00:19:46 +0000 (22:19 -0200)
lib/keyringer/actions/ls
lib/keyringer/completions/bash/keyringer
lib/keyringer/completions/zsh/_keyringer

index 61facc86cff2cbf50eb79d78aec1539bfc885701..bb662637082b9e0d93cb55f9bed20d682204a64c 100755 (executable)
@@ -10,7 +10,7 @@ source "$LIB" || exit 1
 # Aditional parameters
 CWD="`pwd`"
 
-# Avoid trailing slash
+# Avoid leading slash
 shift
 ARGS="`echo "$*" | sed -e "s|^/*||"`"
 
index 88c85cf1c0d415fc3f1f3b8c3d4c5087d6fb048d..bbd49f5eac09f334d3cac2e4cb3e69de3db9dc86 100644 (file)
@@ -95,7 +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
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
         opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       genpair)
@@ -114,11 +114,11 @@ _keyringer() {
   elif [ "${#COMP_WORDS[@]}" == "5" ]; then
     case "${command}" in
       recipients)
-        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid trailing slash
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
         opts="$(cd $path/config/recipients && ls --color=never -p ${cur}* 2> /dev/null)"
         ;;
       genpair)
-        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid trailing slash
+        cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
         opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       git)
index ac31879cd3e7ce02fab691c9a3092f9da8290366..5d0a64c5e2276e7f203a0738635f6dcb916d1aad 100644 (file)
@@ -51,7 +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
+            words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid leading slash
             compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
             ;;
           genpair)
@@ -70,11 +70,11 @@ _keyringer() {
       misc)
         case "$words[3]" in
           recipients)
-            words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid trailing slash
+            words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid leading 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
+            words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid leading slash
             compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]'*' 2> /dev/null)
             ;;
           git)