//infest: clean up zshrc

2 files changed, 17 insertions, 31 deletions

diff --git a/infest/profiles/makefu/bootstrap.sh b/infest/profiles/makefu/bootstrap.sh
index 1c4f6506..67122d0d 100755
--- a/infest/profiles/makefu/bootstrap.sh
+++ b/infest/profiles/makefu/bootstrap.sh
@@ -12,7 +12,7 @@ fi
 
 # write dotfiles
 for dotfile in $(ls .);do
-  [ "./$dotfile" == "$0" ] && continue
+  [ "x./${dotfile}" = "x$0" ] && continue
   cp -fr --remove-destination $dotfile $HOME/.$dotfile
 done
 
@@ -21,7 +21,7 @@ cd $HOME/.vim
 mkdir bundle
 mkdir backup
 echo "* Fetching vim-vundle"
-git clone https://github.com/gmarik/vundle.git bundle/vundle &>/dev/null && echo "Vim Vundle deployed"
+git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && echo "Vim Vundle deployed"
 echo "* Installing Vundle Bundles"
 vim "+:BundleInstall" "+:qall"
 cd -
@@ -34,8 +34,8 @@ if which zsh &>/dev/null ; then
   else
     echo "* zsh already set as default shell"
   fi
-  if [ -d ~/.oh-my-zsh ] ; then
-    git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh &> /dev/null && echo "oh-my-zsh deployed"
+  if [ ! -d ~/.oh-my-zsh ] ; then
+    git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh > /dev/null && echo "oh-my-zsh deployed"
   else
     echo "* oh-my-zsh already installed"
   fi
diff --git a/infest/profiles/makefu/zshrc b/infest/profiles/makefu/zshrc
index 46a02e47..a60313e5 100644
--- a/infest/profiles/makefu/zshrc
+++ b/infest/profiles/makefu/zshrc
@@ -1,58 +1,44 @@
-#custom stuff
-export PATH=$PATH:/krebs/bin:$HOME/bin
 
 # Path to your oh-my-zsh configuration.
 export ZSH=$HOME/.oh-my-zsh
 
-# Set to the name theme to load.
 # Look in ~/.oh-my-zsh/themes/
 export ZSH_THEME="gallifrey"
-#export ZSH_THEME="fishy"
-
-# Set to this to use case-sensitive completion
-# export CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
-# export DISABLE_AUTO_UPDATE="true"
+export DISABLE_AUTO_UPDATE="true"
 
-# Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git ssh-agent)
 source $ZSH/oh-my-zsh.sh
-source ~/.bash_alias
+test -e $HOME/.bash_alias && source $HOME/.bash_alias
+
 # Customize to your needs...
+export PATH=$PATH:/krebs/bin:$HOME/bin
 HISTFILE=~/.histfile
-HISTSIZE=900000
-SAVEHIST=900000
-#PS1='[%n@%m %~]$ '
+HISTSIZE=900001
+SAVEHIST=900001
+
 export EDITOR=vim
-#export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
 export JAVA_HOME=/opt/java/jre
+
 GREP_COLOR="1;33"
-alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 
-export MANPATH=$MANPATH:/home/makefu/man
+export MANPATH=$MANPATH:$HOME/man
 
 if [ -f "$HOME/.dircolors" ] ; then
   eval `dircolors -b "$HOME/.dircolors"`
   export LS_COLORS
 fi
 
-# node.js
-export PATH=$HOME/local/node/bin:$PATH
-
-fortune -a
-echo "--"
-#test -r ~/EVENTS && cat ~/EVENTS
-task
+which fortune >/dev/null && fortune -a
+which task >/dev/null && task
 echo "--"
-#test -r ~/TODO  && cat ~/TODO 
+test -r ~/TODO  && cat ~/TODO 
 
 test -r ~/Dropbox/shared_shell && source ~/Dropbox/shared_shell
 setopt menu_complete
 unsetopt correct_all
-export PATH=$PATH:/home/makefu/CodeSourcery/Sourcery_G++_Lite/bin