Commit f3d6e0aadf55bd58b23b67a57158d9a49d21292b

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

fixes

Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -14,7 +14,7 @@ if [ "$SHELL" != "$(which zsh)" ]; then
14 14 sudo apt-get -yq install curl dialog nano python-setuptools zsh
15 15  
16 16 sudo easy_install pip
17   - sudo pip install virutalenvwrapper
  17 + sudo pip install virtualenvwrapper
18 18 fi
19 19  
20 20 if [ 1 == 1 ]; then
... ... @@ -37,9 +37,9 @@ if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then
37 37 if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then
38 38 rm -rf ~/.config/zsh-config
39 39 fi
40   - if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then
41   - rm -rf ~/.config/oh-my-zsh
42   - fi
  40 +# if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then
  41 +# rm -rf ~/.config/oh-my-zsh
  42 +# fi
43 43 if [ -d ~/.config/antigen ] || [ -h ~/.config/antigen ]; then
44 44 rm -rf ~/.config/antigen
45 45 fi
... ... @@ -65,9 +65,9 @@ hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-c
65 65 }
66 66  
67 67 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
68   -ln -s $ZCNF/templates/zshrc ~/.zshrc
69   -ln -s $ZCNF/templates/bashrc ~/.bashrc
70   -ln -s $ZCNF/templates/bash_aliases ~/.bash_aliases
  68 +ln -s $ZCNF/templates/zshrc.sh ~/.zshrc
  69 +ln -s $ZCNF/templates/bashrc.sh ~/.bashrc
  70 +ln -s $ZCNF/templates/bash_aliases.sh ~/.bash_aliases
71 71 sed -i -e "/^export ZSH=/ c\\
72 72 export ZSH=$ZSH
73 73 " ~/.zshrc
... ... @@ -91,5 +91,5 @@ echo "\033[0;32m"' /____/ ....is no
91 91 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
92 92 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
93 93 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
94   -env zsh
95   -. ~/.zshrc
  94 +#env zsh
  95 +#. ~/.zshrc