diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-26 13:03:24 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-26 13:03:24 +0000 |
| commit | 727912d1cbbc5593a870941d26f3234d49b45847 (patch) | |
| tree | bafb40940f51a81c534415bf93b42e7e25b43e6f /Completion/compinstall | |
| parent | aa99b19c088324b17c0c5e1caee4fc3b5777deab (diff) | |
| download | zsh-727912d1cbbc5593a870941d26f3234d49b45847.tar.gz zsh-727912d1cbbc5593a870941d26f3234d49b45847.zip | |
handle sub-sub-directories of $_compdir as in the CVS-layout (14107)
Diffstat (limited to 'Completion/compinstall')
| -rw-r--r-- | Completion/compinstall | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Completion/compinstall b/Completion/compinstall index 971816ea8..b7b4a8412 100644 --- a/Completion/compinstall +++ b/Completion/compinstall @@ -190,7 +190,9 @@ __ci_set_compdir() { __ci_set_compdir $fpath -if [[ -d $compdir/Base ]]; then +if [[ -d $compdir/Base/Core ]]; then + subdirs=2 +elif [[ -d $compdir/Base ]]; then subdirs=1 ### compdir=${compdir:h} fi @@ -229,12 +231,18 @@ initialised completion in this shell, you should do so, then run compinstall again." fi fi - if [[ -n $subdirs ]]; then + if [[ $subdirs = 2 ]]; then + fpath_line=($compdir/[A-Z]*/[A-Z]*) + fpath_line="fpath=($fpath ${(F)fpath_line})" + elif [[ -n $subdirs ]]; then fpath_line=($compdir/[A-Z]*) fpath_line="fpath=($fpath ${(F)fpath_line})" fi else - if [[ -n $subdirs ]]; then + if [[ $subdirs = 2 ]]; then + print "Completion directories $compdir/*/* +are already in your \$fpath, good." + elif [[ -n $subdirs ]]; then print "Completion directories $compdir/* are already in your \$fpath, good." else |