summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-07-18 16:15:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-07-18 16:15:33 -0300
commit1c3eb4f63525dcfae0e1861d3df0196f06ef9638 (patch)
tree65fa2c07e2a6bfe15e18cd76fdc72d85f6871236
parent23b602d41b1d34af87ea790c9e97cb67442e129c (diff)
downloadkeyringer-1c3eb4f63525dcfae0e1861d3df0196f06ef9638.tar.gz
keyringer-1c3eb4f63525dcfae0e1861d3df0196f06ef9638.tar.bz2
Turn off pathname expansion so expansion can work properly
-rwxr-xr-xkeyringer3
-rw-r--r--lib/keyringer/completions/bash4
2 files changed, 4 insertions, 3 deletions
diff --git a/keyringer b/keyringer
index 934f600..a2ca1f4 100755
--- a/keyringer
+++ b/keyringer
@@ -112,6 +112,9 @@ BASENAME="`basename $0`"
KEYRING="$1"
ACTION="$2"
+# Turn off pathname expansion so expansion can work properly
+set -f
+
# Export preferences and version for other scripts
export PREFERENCES="`dirname $CONFIG`/$KEYRING"
export KEYRINGER_VERSION
diff --git a/lib/keyringer/completions/bash b/lib/keyringer/completions/bash
index c91a8ef..f962c6a 100644
--- a/lib/keyringer/completions/bash
+++ b/lib/keyringer/completions/bash
@@ -35,12 +35,10 @@ _keyringer() {
opts="ls edit"
;;
ls)
- # TODO
if [ -z "${cur}" ]; then
opts="`keyringer $instance ls -p`"
else
- local append
- opts="`keyringer $instance ls -p -d ${cur}* 2> /dev/null`"
+ opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*")"
fi
;;
*)