summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorDaniel Schauenberg <d@unwiredcouch.com>2010-10-01 10:55:44 +0200
committerDaniel Schauenberg <d@unwiredcouch.com>2010-10-01 10:55:44 +0200
commitd340bfab3345a223114b09d589356ff18a1a3efd (patch)
tree10efcbced0aedcbbc0ac0fc759d00734fefdc341 /oh-my-zsh.sh
parentcef6dcd98bb42c5ca2613bbbef12dd384ec8e33a (diff)
parent26d97a9355d37c55e0b044d8dafc425cc0ca7217 (diff)
downloadzsh-d340bfab3345a223114b09d589356ff18a1a3efd.tar.gz
zsh-d340bfab3345a223114b09d589356ff18a1a3efd.tar.bz2
zsh-d340bfab3345a223114b09d589356ff18a1a3efd.zip
Merge remote branch 'origin/master' into restructure_plugins
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bb45c71eb..848e48eb5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -12,7 +12,7 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
# Load all of the plugins that were defined in ~/.zshrc
plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh
+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
# Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
@@ -21,5 +21,3 @@ then
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
-
-unset config_file \ No newline at end of file