Turn off pathname expansion so expansion can work properly

diff --git a/keyringer b/keyringer
index 934f600473fc044d2314a99150077d1639b70715..a2ca1f4a16a88c38c2ff763b01d1e7dc13ef0229 100755 (executable)
--- 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 c91a8ef3dfe6b2cf10e7c311c7418d0e23f5c5ba..f962c6a894381660966f3a6ca5284b817d1d7637 100644 (file)
--- 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
         ;;
       *)