summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oh-my-zsh.sh7
-rw-r--r--plugins/python/python.plugin.zsh5
-rw-r--r--plugins/sublime/sublime.plugin.zsh3
-rw-r--r--plugins/svn/svn.plugin.zsh2
4 files changed, 11 insertions, 6 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 732a403b7..c2b6049cb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -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
-
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 3ea34d718..8be3cd863 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -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"'
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
new file mode 100644
index 000000000..c42c68df1
--- /dev/null
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -0,0 +1,3 @@
+# Sublime Text 2 Aliases
+alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+alias stt='st .'
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e2cf96ca3..4d5bfb8dd 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -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
}