Commit c07932eec342d6ac979b4a7ac8b0abe9730f8365

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

FIX install.sh: no sudo in vz ct

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