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

Merge 81eb57bbcc into 3e30b4d2d1

Browse source
This commit is contained in:
Anthony DiGirolamo 2014-08-31 17:52:21 +00:00
commit e12fc69645
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
oh-my-zsh.sh
View file

@ -8,11 +8,6 @@ fi
# add a function path # add a function path
fpath=($ZSH/functions $ZSH/completions $fpath) fpath=($ZSH/functions $ZSH/completions $fpath)
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh); do
source $config_file
done
# Set ZSH_CUSTOM to the path where your custom config files # Set ZSH_CUSTOM to the path where your custom config files
# and plugins exists, or else we will use the default custom/ # and plugins exists, or else we will use the default custom/
@ -20,6 +15,17 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
ZSH_CUSTOM="$ZSH/custom" ZSH_CUSTOM="$ZSH/custom"
fi fi
# Load all library config files in the lib/ folder. If a config file with the
# same name exists under custom/ don't load the one in lib/. This allows you to
# override default behaviors
for library ($ZSH/lib/*.zsh); do
if [ ! -f $ZSH_CUSTOM/$library:t ]; then
source $library
fi
done
# Load all of your custom configurations from custom/
for config_file ($ZSH_CUSTOM/*.zsh(N)) source $config_file
is_plugin() { is_plugin() {
local base_dir=$1 local base_dir=$1
@ -63,12 +69,6 @@ for plugin ($plugins); do
fi fi
done done
# Load all of your custom configurations from custom/
for config_file ($ZSH_CUSTOM/*.zsh(N)); do
source $config_file
done
unset config_file
# Load the theme # Load the theme
if [ "$ZSH_THEME" = "random" ]; then if [ "$ZSH_THEME" = "random" ]; then
themes=($ZSH/themes/*zsh-theme) themes=($ZSH/themes/*zsh-theme)