47b0d754ae368af16957903f203ee902c7faeec1

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install

Diff

 1diff --git a/tools/install.sh b/tools/install.sh
 2index 343f251ae0d96adb6c9c17f423a13b553c231153..71e19a389f7899a8883c5835d1ceb0655c845e22 100755
 3--- a/tools/install.sh
 4+++ b/tools/install.sh
 5@@ -1,12 +1,10 @@
 6 set -e
 7 
 8-if [ ! -n $ZSH ]
 9-then
10+if [ ! -n "$ZSH" ]; then
11   ZSH=~/.oh-my-zsh
12 fi
13 
14-if [ -d $ZSH ]
15-then
16+if [ -d "$ZSH" ]; then
17   echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
18   exit
19 fi
20@@ -18,8 +16,7 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh
21 }
22 
23 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
24-if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
25-then
26+if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
27   echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
28   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
29 fi
30@@ -43,9 +40,8 @@ echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m
31 echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
32 echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
33 echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
34-echo "\033[0;32m"'                        /____/                       '"\033[0m"
35-
36-echo "\n\n \033[0;32m....is now installed.\033[0m"
37+echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
38 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
39+echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
40 /usr/bin/env zsh
41 . ~/.zshrc