Update install script and .zshrc

Issue ID: #1

Author: zanothis

.gitignore

@@ -1 +1,2 @@
 install_log.txt
+antigen.zsh

.zshrc

@@ -1,5 +1,5 @@
 # Antigen Config
-source /usr/share/zsh/share/antigen.zsh
+source $HOME/.config/zsh/antigen.zsh
 
 antigen bundle zsh-users/zsh-syntax-highlighting
 
@@ -28,10 +28,6 @@ export SAVEHIST=500
 setopt CORRECT
 setopt DVORAK
 
-export SHELL=/usr/bin/zsh
-
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
-source /home/nathan/.dvm/dvm.sh
-
 alias ls="ls -la"

install.sh

@@ -81,16 +81,18 @@ else
 fi
 
 if [ ! -d $HOME/dotfiles ]; then
-  log "Installing dotfiles...\n${INDENT}Cloning into dotfiles..."
+  log "Installing dotfiles.......\n${INDENT}Cloning into dotfiles..."
   git clone https://github.com/zanothis/setup.git $HOME/dotfiles >> $LOG 2>&1
   status_out
-  if [ $? -ne 0 ]; then
+  if [ $? -eq 0 ]; then
     log "\n${INDENT}Linking dotfiles to \"$HOME\"..."
     #log "\n${INDENT}${INDENT}Linking .screenrc....."
     #ln -s $HOME/dotfiles/.screenrc $HOME/.screenrc
     #log "$CHECK\n${INDENT}${INDENT}Linking .inputrc......"
     #ln -s $HOME/dotfiles/.inputrc $HOME/.inputrc
     log "$CHECK\n${INDENT}${INDENT}Linking configs......."
+    mv $HOME/.config $HOME/.config.bak
+    mv $HOME/.i3 $HOME/.i3.bak
     cp -sbr $HOME/dotfiles/.config $HOME/.config
     cp -sbr $HOME/.config/i3 $HOME/.i3
     log "$CHECK\n${INDENT}${INDENT}Linking .vimrc........"
@@ -100,6 +102,7 @@ if [ ! -d $HOME/dotfiles ]; then
     log "$CHECK\n${INDENT}${INDENT}Linking .gitmessage..."
     ln -s $HOME/dotfiles/.gitmessage $HOME/.gitmessage
     log "$CHECK\n${INDENT}${INDENT}Linking .zshrc........"
+    mv $HOME/.zshrc $HOME/.zshrc.bak
     ln -s $HOME/dotfiles/.zshrc $HOME/.zshrc
     logn $CHECK
   fi
@@ -111,6 +114,17 @@ else
   cd $ORIGIN
 fi
 
+log "Checking for Antigen"
+if [ ! -f $HOME/dotfiles/antigen.zsh ]; then
+  log "\n${INDENT}Installing Antigen......"
+  curl -L git.io/antigen > $HOME/dotfiles/antigen.zsh 2>&1
+  status_out
+  log "${INDENT}Linking antigen.zsh....."
+  mkdir -p $HOME/.config/zsh/
+  ln -s $HOME/dotfiles/antigen.zsh $HOME/.config/zsh/antigen.zsh
+  status_out
+fi
+
 if [ ! -f $HOME/.vim/autoload/plug.vim ]; then
   log "Installing plug-vim......."
   curl -fLo $HOME/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
@@ -120,6 +134,8 @@ if [ ! -f $HOME/.vim/autoload/plug.vim ]; then
   status_out
 fi
 
-log "Activating zsh............"
-chsh -s $(which zsh)
-status_out
+if [ $SHELL != "/usr/bin/zsh" ]; then
+  log "Activating zsh............"
+  chsh -s $(which zsh)
+  status_out
+fi