Commit d11596f4c9f067db4e995525f12cc2c1b7a95b3c

Authored by mj
1 parent e03efab23f
Exists in master and in 2 other branches 02-merge, dev

rm ~/.bash_aliases

Showing 1 changed file with 2 additions and 1 deletions Inline Diff

1 # ** Initiate with: ** 1 # ** Initiate with: **
2 # cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh -O -- | sh 2 # cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh -O -| sh
3 # ----------------------------------------------------------------------------------- 3 # -----------------------------------------------------------------------------------
4 4
5 set -e 5 set -e
6 6
7 if [ ! -n "$ZCNF" ]; then 7 if [ ! -n "$ZCNF" ]; then
8 ZCNF=~/.config/zsh-config 8 ZCNF=~/.config/zsh-config
9 fi 9 fi
10 10
11 if [ ! -n "$ZSH" ]; then 11 if [ ! -n "$ZSH" ]; then
12 ZSH=$ZCNF/tools/oh-my-zsh 12 ZSH=$ZCNF/tools/oh-my-zsh
13 fi 13 fi
14 14
15 echo "\033[0;34mCloning Zsh Config...\033[0m" 15 echo "\033[0;34mCloning Zsh Config...\033[0m"
16 hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || { 16 hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || {
17 echo "can't clone repo.. trying to pull" 17 echo "can't clone repo.. trying to pull"
18 hash git >/dev/null 2>&1 && env git pull --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || { 18 hash git >/dev/null 2>&1 && env git pull --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || {
19 echo "can't pull, either.. giving up.." 19 echo "can't pull, either.. giving up.."
20 } 20 }
21 } 21 }
22 22
23 echo "\033[0;34mLooking for an existing zsh config...\033[0m" 23 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
24 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then 24 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
25 echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-zsh-cnf\033[0m"; 25 echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-zsh-cnf\033[0m";
26 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf; 26 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf;
27 fi 27 fi
28 28
29 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m" 29 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
30 ln -s $ZCNF/templates/zshrc ~/.zshrc 30 ln -s $ZCNF/templates/zshrc ~/.zshrc
31 rm ~/.bash_aliases
31 ln -s $ZCNF/templates/bash_aliases ~/.bash_aliases 32 ln -s $ZCNF/templates/bash_aliases ~/.bash_aliases
32 sed -i -e "/^export ZSH=/ c\\ 33 sed -i -e "/^export ZSH=/ c\\
33 export ZSH=$ZSH 34 export ZSH=$ZSH
34 " ~/.zshrc 35 " ~/.zshrc
35 36
36 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" 37 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
37 sed -i -e "/export PATH=/ c\\ 38 sed -i -e "/export PATH=/ c\\
38 export PATH=\"$PATH\" 39 export PATH=\"$PATH\"
39 " ~/.zshrc 40 " ~/.zshrc
40 41
41 if [ "$SHELL" != "$(which zsh)" ]; then 42 if [ "$SHELL" != "$(which zsh)" ]; then
42 echo "\033[0;34mTime to change your default shell to zsh!\033[0m" 43 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
43 chsh -s `which zsh` 44 chsh -s `which zsh`
44 fi 45 fi
45 46
46 echo "\033[0;32m"' __ __ '"\033[0m" 47 echo "\033[0;32m"' __ __ '"\033[0m"
47 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" 48 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m"
48 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" 49 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m"
49 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" 50 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m"
50 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" 51 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m"
51 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m" 52 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m"
52 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m" 53 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
53 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m" 54 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
54 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m" 55 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
55 env zsh 56 env zsh
56 . ~/.zshrc 57 . ~/.zshrc
57 58