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

Merged custom/ and lib/.

Browse source 
Conflicts:

	custom/aliases.zsh
	custom/functions.zsh
	custom/grep.zsh
This commit is contained in:
Sorin Ionescu 2011-05-30 18:39:04 -04:00
commit ec4f279445
9 changed files with 130 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oh-my-zsh.sh
View file

@ -11,9 +11,6 @@ if [ "$TERM" = "dumb" ]; then
DISABLE_COLOR="true"
fi
# add a function path
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) source $config_file
@ -28,16 +25,11 @@ compinit -i
# Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do
if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
source $ZSH/plugins/$plugin/$plugin.plugin.zsh
fi
done
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
# Load the theme
if [ "$ZSH_THEME" = "random" ]
then