linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-09 02:24:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

The previous implementation of oh-my-zsh.sh script would only source custom scripts if they happen to have the same name as scripts in $ZSH/lib. A second for loop will not source the remaining files as well.

Browse source
This commit is contained in:
Martin Zeman 2013-02-10 23:19:01 +01:00
commit 86c44f3660
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
oh-my-zsh.sh
View file

@ -21,13 +21,24 @@ fi
for config_file ($ZSH/lib/*.zsh); do for config_file ($ZSH/lib/*.zsh); do
filename=$(basename "$config_file") filename=$(basename "$config_file")
if [ -f $ZSH_CUSTOM/$filename ]; then if [ -f $ZSH_CUSTOM/$filename ]; then
#echo "source $ZSH_CUSTOM/$filename" # echo "source $ZSH_CUSTOM/$filename"
source $ZSH_CUSTOM/$filename source $ZSH_CUSTOM/$filename
elif [ -f $config_file ]; then elif [ -f $config_file ]; then
#echo "source $config_file" # echo "source $config_file"
source $config_file source $config_file
fi fi
done done
unset config_file
# Now source all remaining .zsh scripts in ZSH_CUSTOM
for config_file ($ZSH_CUSTOM/*.zsh); do
filename=$(basename "$config_file")
if [ ! -f $ZSH/lib/$filename ]; then
# echo "source $config_file"
source $config_file
fi
done
unset config_file
is_plugin() { is_plugin() {
local base_dir=$1 local base_dir=$1
@ -49,7 +60,6 @@ done
autoload -U compinit autoload -U compinit
compinit -i compinit -i
# Load all of the plugins that were defined in ~/.zshrc # Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do for plugin ($plugins); do
if [ -f $ZSH_CUSTOM/$plugin/$plugin.plugin.zsh ]; then if [ -f $ZSH_CUSTOM/$plugin/$plugin.plugin.zsh ]; then
@ -58,9 +68,6 @@ for plugin ($plugins); do
source $ZSH/plugins/$plugin/$plugin.plugin.zsh source $ZSH/plugins/$plugin/$plugin.plugin.zsh
fi fi
done done
# Unser variables
unset config_file
unset plugin unset plugin
# Load the theme # Load the theme