aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-27 19:06:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-27 19:06:35 -0300
commit06cb5c8c45abd9da0dc9860c9a7fe62f74ca509b (patch)
tree76b6d0939f0d209e5d7b0f063238db4bec1bb74f
parent3cb5e902e45d297ee2386c8a76c99f12fed99d15 (diff)
downloadkeyringer-06cb5c8c45abd9da0dc9860c9a7fe62f74ca509b.tar.gz
keyringer-06cb5c8c45abd9da0dc9860c9a7fe62f74ca509b.tar.bz2
Use 'ls --color=never' on shell completions
-rw-r--r--lib/keyringer/completions/bash/keyringer4
-rw-r--r--lib/keyringer/completions/zsh/_keyringer4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index e33977a..3d519c9 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -53,7 +53,7 @@ _keyringer() {
# Process config
source $config/config
path="`eval echo '$'$instance`"
- keyrings="`ls $config | sed -e 's/config//'`"
+ keyrings="`ls --color=never $config | sed -e 's/config//'`"
# Available instances
instances="`echo $keyrings | sed -e 's/ /|/'`"
@@ -89,7 +89,7 @@ _keyringer() {
elif [ "${#COMP_WORDS[@]}" == "5" ]; then
case "${command}" in
recipients)
- opts="$(cd $path/config/recipients && ls -p ${cur}* 2> /dev/null)"
+ opts="$(cd $path/config/recipients && ls --color=never -p ${cur}* 2> /dev/null)"
;;
genpair)
opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index c8ada9b..6059697 100644
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -19,7 +19,7 @@ _keyringer() {
fi
# Process config
- local keyrings="`ls $config | sed -e 's/config//'`"
+ local keyrings="`ls --color=never $config | sed -e 's/config//'`"
source $config/config
keyring_path="`eval echo '$'$words[2]`"
@@ -62,7 +62,7 @@ _keyringer() {
misc)
case "$words[3]" in
recipients)
- compadd "$@" $(cd $keyring_path/config/recipients && ls -p $words[5]* 2> /dev/null)
+ compadd "$@" $(cd $keyring_path/config/recipients && ls --color=never -p $words[5]* 2> /dev/null)
;;
genpair)
# TODO: do not rely on bash