Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Load themes from `$ZSH_CUSTOM` instead of `$ZSH/custom`
  Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files
  Don't drop everything after a trailing slash, as this breaks standard svn branches: ^/branches/featurename ^/releases/Release-vx.y ^/trunk
  changed the alias to use to cli provided by sublime text
  added aliases for sublime text
  Python plugin: added pygrep command, simplified pyclean
  Fixed bug introduced when fixing issue 896
  fixed introduced to parse_git_dirty
  changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
  fixed asterisk display for modified repos in git prior to 1.7.2
  Removed trailing spaces in Git files. Fixes #867
  update rails runner alias to ru
  added rails to bundled_commands
  add rails runner alias

Conflicts:
	lib/git.zsh
	oh-my-zsh.sh
  • Loading branch information...
2 parents 261d1ce + 3fdaf26 commit 02dd4baa6c59c61f75c35ca4cf6bb935566e13d3 @kusnier committed May 21, 2012
View
@@ -51,22 +51,22 @@ 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" ]
then
themes=($ZSH/themes/*zsh-theme)
N=${#themes[@]}
- ((N=(RANDOM%N)+1))
- RANDOM_THEME=${themes[$N]}
- source "$RANDOM_THEME"
- echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
+ ((N=(RANDOM%N)+1))
+ RANDOM_THEME=${themes[$N]}
+ source "$RANDOM_THEME"
+ echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
else
- if [ ! "$ZSH_THEME" = "" ]
- then
- if [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]
+ if [ ! "$ZSH_THEME" = "" ]
then
+ if [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]
+ then
source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
@@ -6,7 +6,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec
-bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
## Functions
@@ -60,4 +60,4 @@ compdef ggpull=git
alias ggpush='git push origin $(current_branch)'
compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
+compdef ggpnp=git
@@ -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"'
@@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'
alias sg='ruby script/generate'
alias sd='ruby script/destroy'
alias sp='ruby script/plugin'
+alias sr='ruby script/runner'
alias ssp='ruby script/spec'
alias rdbm='rake db:migrate'
alias sc='ruby script/console'
@@ -14,6 +14,7 @@ alias rdb='_rails_command dbconsole'
alias rdbm='rake db:migrate db:test:clone'
alias rg='_rails_command generate'
alias rp='_rails_command plugin'
+alias ru='_rails_command runner'
alias rs='_rails_command server'
alias rsd='_rails_command server --debugger'
alias devlog='tail -f log/development.log'
@@ -0,0 +1,3 @@
+# Sublime Text 2 Aliases
+alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+alias stt='st .'
@@ -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
}

0 comments on commit 02dd4ba

Please sign in to comment.