Merge branch 'add_submodule'

This commit is contained in:
ys 2013-04-24 16:41:10 +08:00
commit caae8a1220
4 changed files with 12 additions and 3 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "plugins/zsh-syntax-highlighting"]
path = plugins/zsh-syntax-highlighting
url = git://github.com/zsh-users/zsh-syntax-highlighting.git

View file

@ -22,9 +22,9 @@ h4. via `wget`
h3. The manual way
1. Clone the repository
1. Clone the repository and all submodules.
@git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
@git clone --recursive git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
2. *OPTIONAL* Backup your existing ~/.zshrc file

View file

@ -10,6 +10,12 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh
exit
}
echo "\033[0;34mCloining submodule...\033[0m"
current_path=`pwd`
cd ~/.oh-my-zsh
/usr/bin/env git submodule update --init
cd "$current_path"
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
then

View file

@ -2,7 +2,7 @@ current_path=`pwd`
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH"
if git pull origin master
if git pull origin master && git submodule foreach git pull
then
printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '