p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't override zsh users' compinit options. 

I call "compinit -i" in my .zshrc, to allow loading autocompletion from
"unsafe" locations. envsetup.sh breaks that. Change behavior to only
call compinit if bash-style completion is not already enabled.

This is a minimal fix; an alternative would be to rely on the user
to call 'bashcompinit' in their .zshrc instead, and just skip all
autocomplete functionality if they don't.

Test: manual - source ./envsetup.sh in {bash, zsh, zsh -f} and test
	completion for lunch
Change-Id: Ibb10eb68a96d69c19b9db9b21e0546fe8ae299b2
This commit is contained in:
Patrik Fimml 2018-10-15 18:15:12 +02:00
parent 0e91bac015
commit df248e60e5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
envsetup.sh
View File

@ -1574,9 +1574,12 @@ function atest()
} }
# Zsh needs bashcompinit called to support bash-style completion. # Zsh needs bashcompinit called to support bash-style completion.
function add_zsh_completion() { function enable_zsh_completion() {
autoload -U compinit && compinit # Don't override user's options if bash-style completion is already enabled.
autoload -U bashcompinit && bashcompinit if ! declare -f complete >/dev/null; then
autoload -U compinit && compinit
autoload -U bashcompinit && bashcompinit
fi
} }
function validate_current_shell() { function validate_current_shell() {
@ -1587,7 +1590,7 @@ function validate_current_shell() {
;; ;;
*zsh*) *zsh*)
function check_type() { type "$1"; } function check_type() { type "$1"; }
add_zsh_completion ;; enable_zsh_completion ;;
*) *)
echo -e "WARNING: Only bash and zsh are supported.\nUse of other shell would lead to erroneous results." echo -e "WARNING: Only bash and zsh are supported.\nUse of other shell would lead to erroneous results."
;; ;;