Use "compopt -o filenames" if available instead of "compgen -f" hack in _cd().

2010-10-07 20:37:06 +03:00 · 2010-10-07 20:37:06 +03:00 · 96b1594e4e
commit 96b1594e4e
parent a55f763363
1 changed files with 4 additions and 2 deletions
--- a/6
+++ b/6
@ -1370,8 +1370,10 @@ _cd()
        return 0
    fi

-    # Enable -o filenames option, see Debian bug #272660
-    compgen -f /non-existing-dir/ >/dev/null
+    # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
+    # info about the compgen hack (bash < 4)
+    compopt -o filenames 2>/dev/null || \
+        compgen -f /non-existing-dir/ >/dev/null

    # Use standard dir completion if no CDPATH or parameter starts with /,
    # ./ or ../