Merge branch 'master' of github.com:abiggs/oh-my-zsh

This commit is contained in:
Aaron Biggs 2014-04-28 16:17:48 -05:00
commit 35485a34db
2 changed files with 6 additions and 6 deletions

View file

@ -47,6 +47,8 @@ ZSH_THEME="agnoster"
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(battery capistrano common-aliases git github rbenv sublime systemadmin) plugins=(battery capistrano common-aliases git github rbenv sublime systemadmin)
source $ZSH/oh-my-zsh.sh
# User configuration # User configuration
export PATH=:/usr/local/bin:$HOME/bin:$PATH export PATH=:/usr/local/bin:$HOME/bin:$PATH
@ -64,5 +66,3 @@ export PATH=:/usr/local/bin:$HOME/bin:$PATH
# ssh # ssh
# export SSH_KEY_PATH="~/.ssh/dsa_id" # export SSH_KEY_PATH="~/.ssh/dsa_id"
source $ZSH/oh-my-zsh.sh

View file

@ -25,10 +25,10 @@ fi
echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" # echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
sed -i -e "/export PATH=/ c\\ # sed -i -e "/export PATH=/ c\\
export PATH=\"$PATH\" # export PATH=\"$PATH\"
" ~/.zshrc # " ~/.zshrc
echo "\033[0;34mTime to change your default shell to zsh!\033[0m" echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
chsh -s `which zsh` chsh -s `which zsh`