From f0e99456ed9cf85751c019a200a7ba7c6c300f65 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Mon, 20 Feb 2017 17:44:58 -0600
Subject: Fix tab completion of directories and filenames (#3184)

---
 share/spack/spack-completion.bash | 46 ++++++++++-----------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index 3e98b20df0..61cbb27243 100755
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -136,8 +136,6 @@ function _spack_bootstrap {
     if $list_options
     then
         compgen -W "-h --help -r --remote" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -192,8 +190,6 @@ function _spack_compiler_add {
     if $list_options
     then
         compgen -W "-h --help --scope" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -375,8 +371,6 @@ function _spack_flake8 {
     then
         compgen -W "-h --help -k --keep-temp -o --output
                     -r --root-relative -U --no-untracked" -- "$cur"
-    else
-        compgen -o filenames -- "$cur"
     fi
 }
 
@@ -452,8 +446,6 @@ function _spack_md5 {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o filenames -- "$cur"
     fi
 }
 
@@ -470,8 +462,6 @@ function _spack_mirror_add {
     if $list_options
     then
         compgen -W "-h --help --scope" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -613,8 +603,6 @@ function _spack_python {
     if $list_options
     then
         compgen -W "-h --help -c" -- "$cur"
-    else
-        compgen -o filenames -- "$cur"
     fi
 }
 
@@ -635,8 +623,6 @@ function _spack_repo_add {
     if $list_options
     then
         compgen -W "-h --help --scope" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -644,8 +630,6 @@ function _spack_repo_create {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -813,8 +797,6 @@ function _spack_view_hardlink {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -822,8 +804,6 @@ function _spack_view_remove {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -841,8 +821,6 @@ function _spack_view_statlink {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -855,8 +833,6 @@ function _spack_view_symlink {
     if $list_options
     then
         compgen -W "-h --help" -- "$cur"
-    else
-        compgen -o dirnames -- "$cur"
     fi
 }
 
@@ -894,18 +870,18 @@ function _tests {
 # Testing functions
 
 function _test_vars {
-    echo "-----------------------------------------------------"            >> temp
-    echo "Full line:                '$COMP_LINE'"                           >> temp
-    echo                                                                    >> temp
+    echo "-----------------------------------------------------"             >> temp
+    echo "Full line:                '$COMP_LINE'"                            >> temp
+    echo                                                                     >> temp
     echo "Word list w/ flags:       $(_pretty_print COMP_WORDS[@])"          >> temp
-    echo "# words w/ flags:         '${#COMP_WORDS[@]}'"                    >> temp
-    echo "Cursor index w/ flags:    '$COMP_CWORD'"                          >> temp
-    echo                                                                    >> temp
+    echo "# words w/ flags:         '${#COMP_WORDS[@]}'"                     >> temp
+    echo "Cursor index w/ flags:    '$COMP_CWORD'"                           >> temp
+    echo                                                                     >> temp
     echo "Word list w/out flags:    $(_pretty_print COMP_WORDS_NO_FLAGS[@])" >> temp
-    echo "# words w/out flags:      '${#COMP_WORDS_NO_FLAGS[@]}'"           >> temp
-    echo "Cursor index w/out flags: '$COMP_CWORD_NO_FLAGS'"                 >> temp
-    echo                                                                    >> temp
-    echo "Subfunction:              '$subfunction'"                         >> temp
+    echo "# words w/out flags:      '${#COMP_WORDS_NO_FLAGS[@]}'"            >> temp
+    echo "Cursor index w/out flags: '$COMP_CWORD_NO_FLAGS'"                  >> temp
+    echo                                                                     >> temp
+    echo "Subfunction:              '$subfunction'"                          >> temp
     if $list_options
     then
         echo "List options:             'True'"  >> temp
@@ -929,4 +905,4 @@ function _pretty_print {
     done
 }
 
-complete -F _bash_completion_spack spack
+complete -o default -F _bash_completion_spack spack
-- 
cgit v1.2.3-70-g09d2