Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

This commit is contained in:
Corey Woodcox 2012-05-28 18:30:14 -06:00
commit a1a1f456b3
4 changed files with 11 additions and 6 deletions

View File

@ -51,7 +51,7 @@ for plugin ($plugins); do
done
# Load all of your custom configurations from custom/
for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file
# Load the theme
if [ "$ZSH_THEME" = "random" ]
@ -65,12 +65,11 @@ then
else
if [ ! "$ZSH_THEME" = "" ]
then
if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
then
source "$ZSH/custom/$ZSH_THEME.zsh-theme"
source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
fi
fi
fi

View File

@ -2,4 +2,7 @@
alias pyfind='find . -name "*.py"'
# Remove python compiled byte-code
alias pyclean='find . -type f -name "*.py[co]" -exec rm -f \{\} \;'
alias pyclean='find . -type f -name "*.py[co]" -delete'
# Grep among .py files
alias pygrep='grep --include="*.py"'

View File

@ -0,0 +1,3 @@
# Sublime Text 2 Aliases
alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
alias stt='st .'

View File

@ -16,7 +16,7 @@ function svn_get_repo_name {
if [ $(in_svn) ]; then
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
fi
}