summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorChristian Höltje <docwhat@gerf.org>2011-11-16 09:46:05 -0500
committerChristian Höltje <docwhat@gerf.org>2011-11-16 09:46:05 -0500
commit258457ea4fe0b8fcb1f6d0242071edb82cab449a (patch)
tree78fc86ced20d5bbe0a8c123facd60131828789f4 /oh-my-zsh.sh
parent3512eca2cefee9b89b08230021c25f6e30525e31 (diff)
downloadzsh-258457ea4fe0b8fcb1f6d0242071edb82cab449a.tar.gz
zsh-258457ea4fe0b8fcb1f6d0242071edb82cab449a.tar.bz2
zsh-258457ea4fe0b8fcb1f6d0242071edb82cab449a.zip
Moved ZSH_CUSTOM declaration before fpath is set
* also normalized style to match the guide.
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 8f5e2472d..7ae41c33e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,6 +13,12 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
# TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh) source $config_file
+# Set ZSH_CUSTOM to the path where your custom config files
+# and plugins exists, or else we will use the default custom/
+if [[ -z "$ZSH_CUSTOM" ]]; then
+ ZSH_CUSTOM="$ZSH/custom"
+fi
+
# Add all defined plugins to fpath. This must be done
# before running compinit.
plugin=${plugin:=()}
@@ -28,12 +34,6 @@ done
autoload -U compinit
compinit -i
-# Set ZSH_CUSTOM to the path where your custom config files
-# and plugins exists, or else we will use the default custom/
-if [ "$ZSH_CUSTOM" = "" ]
-then
- ZSH_CUSTOM="$ZSH/custom"
-fi
# Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do