StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't override zsh users' compinit options."

Browse Source
This commit is contained in:
Patrik Fimml
2018-10-17 10:53:33 +00:00
committed by Gerrit Code Review
parent c948d1a101 df248e60e5
commit bcd3d85971
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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() {
# Don't override user's options if bash-style completion is already enabled.
if ! declare -f complete >/dev/null; then
autoload -U compinit && compinit autoload -U compinit && compinit
autoload -U bashcompinit && bashcompinit 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."
;; ;;