a1a1f456b3f9204ec794e3b81d55a899de8fd92f

Author
Corey Woodcox <corey.woodcox@gmail.com>
Committer
Corey Woodcox <corey.woodcox@gmail.com>
Date

Message

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

Diff

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index 732a403b74c7f04ee2f283feb5b851c19c173889..c2b6049cbcba4db8963673e6093690d6f1721b0e 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -51,7 +51,7 @@ for plugin ($plugins); do
 6 done
 7 
 8 # Load all of your custom configurations from custom/
 9-for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
10+for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file
11 
12 # Load the theme
13 if [ "$ZSH_THEME" = "random" ]
14@@ -65,12 +65,11 @@ then
15 else
16   if [ ! "$ZSH_THEME" = ""  ]
17   then
18-    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
19+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
20     then
21-      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
22+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
23     else
24       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
25     fi
26   fi
27 fi
28-
29diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
30index 3ea34d7182828efb009f14b02daadd48600f5123..8be3cd86311c68930a7a187a77d345cccb67430b 100644
31--- a/plugins/python/python.plugin.zsh
32+++ b/plugins/python/python.plugin.zsh
33@@ -2,4 +2,7 @@
34 alias pyfind='find . -name "*.py"'
35 
36 # Remove python compiled byte-code
37-alias pyclean='find . -type f -name "*.py[co]" -exec rm -f \{\} \;'
38+alias pyclean='find . -type f -name "*.py[co]" -delete'
39+
40+# Grep among .py files
41+alias pygrep='grep --include="*.py"'
42diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
43new file mode 100644
44index 0000000000000000000000000000000000000000..c42c68df1d2b1a759dd618a18d75ce2d3685856a
45--- /dev/null
46+++ b/plugins/sublime/sublime.plugin.zsh
47@@ -0,0 +1,3 @@
48+# Sublime Text 2 Aliases
49+alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
50+alias stt='st .'
51diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
52index e2cf96ca36acf280cfdb9b6fbf168610f51471fc..4d5bfb8dd73193c3da8e70ae5cb1119312c4533a 100644
53--- a/plugins/svn/svn.plugin.zsh
54+++ b/plugins/svn/svn.plugin.zsh
55@@ -16,7 +16,7 @@ function svn_get_repo_name {
56     if [ $(in_svn) ]; then
57         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
58     
59-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
60+        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
61     fi
62 }
63