Commit 8f1d44163d6a4550d53d2acffc49dde04c37a9bf

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

FIX install.sh: remove obsolete part

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