Commit 3e0b1d5fd6bb4e02160371c9b3ccf3c649f619b9

Authored by mj
1 parent dc86e685b0
Exists in master and in 1 other branch 02-merge

[FIX] install.sh: DON'T ALWAYS INSTALL

fi

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

1 #@IgnoreInspection AddShebang 1 #@IgnoreInspection AddShebang
2 # 2 #
3 # ** Initiate with: ** 3 # ** Initiate with: **
4 # cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh | sh 4 # cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh | sh
5 # 5 #
6 # --------------------------------------------------------------------------------------------- 6 # ---------------------------------------------------------------------------------------------
7 # 7 #
8 # gj@ubuntu4docker:~$ touch install.sh 8 # gj@ubuntu4docker:~$ touch install.sh
9 # gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh 9 # gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh
10 # 10 #
11 ################################################################################################ 11 ################################################################################################
12 12
13 set -e 13 set -e
14 14
15 if [ ! -n "$DONTINSTALL" ] || [ ! "$DONTINSTALL" eq "0" ]; then 15 if [ ! -n "$DONTINSTALL" ] || [ ! "$DONTINSTALL" eq "0" ]; then
16 echo "~~" INSTALLING ~~~"
17
16 DONTINSTALL="1" 18 DONTINSTALL="1"
17 19
18 if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then 20 if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then
19 apt-get -yq install curl dialog git nano screen zsh 21 apt-get -yq install curl dialog git nano screen zsh
20 else 22 else
21 if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi 23 if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi
22 24
23 if [ "$SHELL" != "$(which zsh)" ]; then 25 if [ "$SHELL" != "$(which zsh)" ]; then
24 echo "$(which zsh)" 26 echo "$(which zsh)"
25 $CMD_PREFIX echo "enter pass...." 27 $CMD_PREFIX echo "enter pass...."
26 28
27 echo "ok" 29 echo "ok"
28 30
29 $CMD_PREFIX apt-get -yq install curl dialog git nano zsh 31 $CMD_PREFIX apt-get -yq install curl dialog git nano zsh
30 fi 32 fi
31 fi 33 fi
32 fi 34 fi
33 35
34 if [ ! -n "$HOME" ]; then 36 if [ ! -n "$HOME" ]; then
35 HOME=~/ 37 HOME=~/
36 fi 38 fi
37 39
38 if [ ! -n "$ZCNF" ]; then 40 if [ ! -n "$ZCNF" ]; then
39 ZCNF=$HOME/.config/zsh-config 41 ZCNF=$HOME/.config/zsh-config
40 fi 42 fi
41 43
42 if [ ! -n "$ZSH" ]; then 44 if [ ! -n "$ZSH" ]; then
43 ZSH=$ZCNF/repos/oh-my-zsh 45 ZSH=$ZCNF/repos/oh-my-zsh
44 fi 46 fi
45 47
46 echo "\033[0;34mCleaning...\033[0m" 48 echo "\033[0;34mCleaning...\033[0m"
47 if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then 49 if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then
48 rm -rf ~/.config/zsh-config 50 rm -rf ~/.config/zsh-config
49 fi 51 fi
50 52
51 if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then 53 if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then
52 rm -rf ~/.config/oh-my-zsh 54 rm -rf ~/.config/oh-my-zsh
53 fi 55 fi
54 56
55 if [ -d ~/.config/antigen ] || [ -h ~/.config/antigen ]; then 57 if [ -d ~/.config/antigen ] || [ -h ~/.config/antigen ]; then
56 rm -rf ~/.config/antigen 58 rm -rf ~/.config/antigen
57 fi 59 fi
58 60
59 if [ -d ~/.oh-my-zsh ] || [ -h ~/.oh-my-zsh ]; then 61 if [ -d ~/.oh-my-zsh ] || [ -h ~/.oh-my-zsh ]; then
60 rm -rf ~/.oh-my-zsh 62 rm -rf ~/.oh-my-zsh
61 fi 63 fi
62 64
63 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then 65 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
64 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf 66 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf
65 fi 67 fi
66 68
67 # 69 #
68 # BASH: 70 # BASH:
69 # 71 #
70 if [ -f ~/.bashrc ] || [ -h ~/.bashrc ]; then 72 if [ -f ~/.bashrc ] || [ -h ~/.bashrc ]; then
71 mv ~/.bashrc ~/.bashrc.pre-zsh-cnf 73 mv ~/.bashrc ~/.bashrc.pre-zsh-cnf
72 fi 74 fi
73 if [ -f ~/.bash_aliases ] || [ -h ~/.bash_aliases ]; then 75 if [ -f ~/.bash_aliases ] || [ -h ~/.bash_aliases ]; then
74 rm ~/.bash_aliases 76 rm ~/.bash_aliases
75 fi 77 fi
76 78
77 echo "\033[0;34mCloning Zsh Config...\033[0m" 79 echo "\033[0;34mCloning Zsh Config...\033[0m"
78 hash git >/dev/null 2>&1 && env git clone --branch master --single-branch --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || { 80 hash git >/dev/null 2>&1 && env git clone --branch master --single-branch --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || {
79 echo "can't clone repo.." 81 echo "can't clone repo.."
80 exit 1 82 exit 1
81 } 83 }
82 84
83 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m" 85 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
84 cp $ZCNF/templates/zshrc.sh ~/.zshrc 86 cp $ZCNF/templates/zshrc.sh ~/.zshrc
85 cp $ZCNF/templates/bashrc.sh ~/.bashrc 87 cp $ZCNF/templates/bashrc.sh ~/.bashrc
86 88
87 #sed -i -e "/^export ZSH=/ c\\ 89 #sed -i -e "/^export ZSH=/ c\\
88 #export ZSH=$ZSH 90 #export ZSH=$ZSH
89 #" ~/.zshrc 91 #" ~/.zshrc
90 92
91 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" 93 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
92 sed -i -e "/export PATH=/ c\\ 94 sed -i -e "/export PATH=/ c\\
93 export PATH=\"$PATH\" 95 export PATH=\"$PATH\"
94 " ~/.zshrc 96 " ~/.zshrc
95 97
96 if [ "$SHELL" != "$(which zsh)" ]; then 98 if [ "$SHELL" != "$(which zsh)" ]; then
97 echo "\033[0;34mTime to change your default shell to zsh!\033[0m" 99 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
98 # echo "chsh -s $(which zsh)" 100 # echo "chsh -s $(which zsh)"
99 echo "chsh -s /bin/zsh" 101 echo "chsh -s /bin/zsh"
100 fi 102 fi
101 103
102 echo "\033[0;32m"' __ __ '"\033[0m" 104 echo "\033[0;32m"' __ __ '"\033[0m"
103 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" 105 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m"
104 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" 106 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m"
105 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" 107 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m"
106 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" 108 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m"
107 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m" 109 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m"
108 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m" 110 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
109 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m" 111 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
110 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m" 112 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
111 #env zsh 113 #env zsh
112 #. ~/.zshrc 114 #. ~/.zshrc
113 115