From 73751408bff50bdfd1faa52e6794becded039c8a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 28 Dec 2013 11:30:11 +0000 Subject: [PATCH] Update oh-my-zsh --- shell/git.sh | 10 +++++----- shell/zsh/oh-my-zsh | 2 +- shell/zshrc.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shell/git.sh b/shell/git.sh index ecaca42..2f004b4 100755 --- a/shell/git.sh +++ b/shell/git.sh @@ -24,12 +24,12 @@ alias gix="gitx" alias gx="gitx" # Git Completion -if [ -f "/usr/local/etc/bash_completion.d/git-completion.bash" ]; then - source "/usr/local/etc/bash_completion.d/git-completion.bash" -fi - -# Only needed for Bash. Zsh is much smarter with it's auto-completion ^_^ if [ -n "$BASH_VERSION" ]; then + if [ -f "/usr/local/etc/bash_completion.d/git-completion.bash" ]; then + source "/usr/local/etc/bash_completion.d/git-completion.bash" + fi + + # Only needed for Bash. Zsh is much smarter with it's auto-completion ^_^ complete -o default -o nospace -F _git g complete -o default -o nospace -F _git gi fi diff --git a/shell/zsh/oh-my-zsh b/shell/zsh/oh-my-zsh index 2cc4801..a38af27 160000 --- a/shell/zsh/oh-my-zsh +++ b/shell/zsh/oh-my-zsh @@ -1 +1 @@ -Subproject commit 2cc4801bd25a619cae8b41d698ff0489f7d629c3 +Subproject commit a38af27991d15d14ac4ca55c919bb694d7eafb7a diff --git a/shell/zshrc.sh b/shell/zshrc.sh index 903091f..a780ee0 100644 --- a/shell/zshrc.sh +++ b/shell/zshrc.sh @@ -34,7 +34,7 @@ DISABLE_AUTO_TITLE="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=(brew bundler cake cap gem heroku node nyan osx powder python rails3 \ +plugins=(brew bundler cake cap gem heroku node nyan osx powder python rails \ ruby thor vagrant) source "$ZSH/oh-my-zsh.sh"