Commit 6ae4c388 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Shell completions: fix handling of keyrings with '-' in their names

parent bfd71870
2014-08-16 - Silvio Rhatto <rhatto@riseup.net>
2014-08-21 - Silvio Rhatto <rhatto@riseup.net>
Shell completions: fix handling of keyrings with '-' in their names
Edit: Unset RELATIVE_PATH before encrypting file
......
......@@ -69,7 +69,6 @@ _keyringer() {
fi
# Process config
source $config/config
keyrings="`ls --color=never $config | sed -e '/^config$/d' | xargs`"
# Available instances
......@@ -77,7 +76,7 @@ _keyringer() {
# The current instance
instance="${COMP_WORDS[1]}"
path="`eval echo '$'$instance`"
path="`grep -e "^$instance=" "$config/config" | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'`"
# Command completions
if [ "${#COMP_WORDS[@]}" == "2" ]; then
......
......@@ -19,9 +19,8 @@ _keyringer() {
fi
# Process config
source $config/config
local keyrings="`ls --color=never $config | sed -e '/^config$/d' | xargs`"
local keyring_path="`eval echo '$'$words[2]`"
local keyring_path="`grep -e "^$words[2]=" "$config/config" | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'`"
local instances="`echo $keyrings | sed -e 's/ /$\\\|^/g' -e 's/^/^/' -e 's/$/$/'`"
_arguments \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment