From af04d5794846da860754ea9382ba8621a7c62b37 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sun, 17 Jul 2011 20:28:50 -0400 Subject: [PATCH] Check for bashcompinit availability before loading it; unset variables. --- plugins/compleat/compleat.plugin.zsh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh index 7fbd2b9..6601310 100644 --- a/plugins/compleat/compleat.plugin.zsh +++ b/plugins/compleat/compleat.plugin.zsh @@ -1,20 +1,20 @@ # ------------------------------------------------------------------------------ # FILE: compleat.plugin.zsh # DESCRIPTION: oh-my-zsh plugin file. -# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com) -# VERSION: 1.0.0 +# AUTHOR: Sorin Ionescu +# VERSION: 1.0.1 # ------------------------------------------------------------------------------ if (( ${+commands[compleat]} )); then - local prefix="${commands[compleat]:h:h}" - local setup="${prefix}/share/compleat-1.0/compleat_setup" + compleat_setup="${commands[compleat]:h:h}/share/compleat-1.0/compleat_setup" - if [[ -f "$setup" ]]; then + if [[ -f "$compleat_setup" ]]; then if ! bashcompinit >/dev/null 2>&1; then - autoload -U bashcompinit - bashcompinit -i + autoload -Uz bashcompinit && bashcompinit fi - source "$setup" + source "$compleat_setup" + unset compleat_setup fi fi +