Permalink
Browse files

Use consistent includes. Fixes #4

  • Loading branch information...
1 parent 3f7716b commit 14915b34dee6f024c8bf4ad5c81fe3ffee21b203 @gf3 committed Aug 4, 2012
Showing with 9 additions and 17 deletions.
  1. +2 −3 .bash_profile
  2. +5 −9 .commonrc
  3. +2 −5 .zshrc
View
@@ -1,7 +1,5 @@
# Prompt
-if [ -f ~/.bash_prompt ]; then
- source ~/.bash_prompt
-fi
+[[ -f "$HOME/.bash_prompt" ]] && source "$HOME/.bash_prompt"
# Larger bash history (default is 500)
export HISTFILESIZE=10000
@@ -11,3 +9,4 @@ PATH="/usr/local/bin:/usr/local/sbin:$PATH"
# Common junk
[[ -s "$HOME/.commonrc" ]] && source "$HOME/.commonrc"
+
View
@@ -1,16 +1,12 @@
# Load things
-if [ -f ~/.aliases ]; then
- source ~/.aliases
-fi
+[[ -f "$HOME/.aliases" ]] && source "$HOME/.aliases"
-if [ -f ~/.functions ]; then
- source ~/.functions
-fi
+[[ -f "$HOME/.functions" ]] && source "$HOME/.functions"
# Adjust $PATH
-if [ -d ~/.scripts ] ; then
- export PATH=$HOME/.scripts:$PATH
-fi
+[[ -d "$HOME/.scripts" ]] && export PATH=$HOME/.scripts:$PATH
+
+[[ -d "$HOME/.lein/bin" ]] && export PATH=$HOME/.lein/bin:$PATH
# Misc settings
export EDITOR=vim
View
7 .zshrc
@@ -9,23 +9,20 @@ export ZSH_THEME="prose"
# 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=(osx git ruby gem rails brew command-not-found)
+plugins=(osx git ruby gem node npm heroku cap bundler brew cake rails3 redis-cli zsh-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
# Customize to your needs...
export PATH=/usr/local/bin:/usr/local/sbin:/usr/local/racket/bin:$PATH
-# Android SDK
-export PATH=$PATH:/Users/gianni/Projects/java/android-sdk-mac_x86/tools
-
# Common junk
[[ -s "$HOME/.commonrc" ]] && source "$HOME/.commonrc"

0 comments on commit 14915b3

Please sign in to comment.