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/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
30index e1f571237a74f75d5522b073e8cdbfaa9efc502a..2b80b76e679a37f29ef2559b5f6f1bf44a0aff5c 100644
31--- a/plugins/bundler/bundler.plugin.zsh
32+++ b/plugins/bundler/bundler.plugin.zsh
33@@ -6,7 +6,7 @@ alias bu="bundle update"
34
35 # The following is based on https://github.com/gma/bundler-exec
36
37-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)
38+bundled_commands=(annotate cap capify cucumber ey foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
39
40 ## Functions
41
42diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
43index 16a5d54cadb59c99533956e0f1f565531613aa6e..39d3ef36a05280e9e285412afecba861278bd73c 100644
44--- a/plugins/debian/debian.plugin.zsh
45+++ b/plugins/debian/debian.plugin.zsh
46@@ -40,20 +40,23 @@ alias ap='apt-cache policy'
47 # superuser operations ######################################################
48 if [[ $use_sudo -eq 1 ]]; then
49 # commands using sudo #######
50- alias aac="sudo $apt_pref autoclean"
51- alias abd="sudo $apt_pref build-dep"
52- alias ac="sudo $apt_pref clean"
53- alias ad="sudo $apt_pref update"
54- alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
55- alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
56+ alias aac='sudo $apt_pref autoclean'
57+ alias abd='sudo $apt_pref build-dep'
58+ alias ac='sudo $apt_pref clean'
59+ alias ad='sudo $apt_pref update'
60+ alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
61+ alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
62 alias afu='sudo apt-file update'
63- alias ag="sudo $apt_pref upgrade"
64- alias ai="sudo $apt_pref install"
65- alias ap="sudo $apt_pref purge"
66- alias ar="sudo $apt_pref remove"
67+ alias ag='sudo $apt_pref upgrade'
68+ alias ai='sudo $apt_pref install'
69+ # Install all packages given on the command line while using only the first word of each line:
70+ # acs ... | ail
71+ alias ail="sed -e 's/ */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo $apt_pref install'
72+ alias ap='sudo $apt_pref purge'
73+ alias ar='sudo $apt_pref remove'
74
75 # apt-get only
76- alias ads="sudo $apt_pref dselect-upgrade"
77+ alias ads='sudo $apt_pref dselect-upgrade'
78
79 # Install all .deb files in the current directory.
80 # Warning: you will need to put the glob in single quotes if you use:
81@@ -67,18 +70,18 @@ if [[ $use_sudo -eq 1 ]]; then
82
83 # commands using su #########
84 else
85- alias aac='su -ls "'"$apt_pref"' autoclean" root'
86+ alias aac='su -ls \'$apt_pref autoclean\' root'
87 abd() {
88 cmd="su -lc '$apt_pref build-dep $@' root"
89 print "$cmd"
90 eval "$cmd"
91 }
92- alias ac='su -ls "'"$apt_pref"' clean" root'
93- alias ad='su -lc "'"$apt_pref"' update" root'
94- alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
95- alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
96+ alias ac='su -ls \'$apt_pref clean\' root'
97+ alias ad='su -lc \'$apt_pref update\' root'
98+ alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
99+ alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
100 alias afu='su -lc "apt-file update"'
101- alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
102+ alias ag='su -lc \'$apt_pref safe-upgrade\' root'
103 ai() {
104 cmd="su -lc 'aptitude -P install $@' root"
105 print "$cmd"
106@@ -118,7 +121,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
107 apt-copy() {
108 print '#!/bin/sh'"\n" > apt-copy.sh
109
110- cmd="$apt_pref install "
111+ cmd='$apt_pref install'
112
113 for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
114 cmd="${cmd} ${p}"
115diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
116index 3ea34d7182828efb009f14b02daadd48600f5123..8be3cd86311c68930a7a187a77d345cccb67430b 100644
117--- a/plugins/python/python.plugin.zsh
118+++ b/plugins/python/python.plugin.zsh
119@@ -2,4 +2,7 @@
120 alias pyfind='find . -name "*.py"'
121
122 # Remove python compiled byte-code
123-alias pyclean='find . -type f -name "*.py[co]" -exec rm -f \{\} \;'
124+alias pyclean='find . -type f -name "*.py[co]" -delete'
125+
126+# Grep among .py files
127+alias pygrep='grep --include="*.py"'
128diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
129new file mode 100644
130index 0000000000000000000000000000000000000000..c42c68df1d2b1a759dd618a18d75ce2d3685856a
131--- /dev/null
132+++ b/plugins/sublime/sublime.plugin.zsh
133@@ -0,0 +1,3 @@
134+# Sublime Text 2 Aliases
135+alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
136+alias stt='st .'
137diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
138index e2cf96ca36acf280cfdb9b6fbf168610f51471fc..4d5bfb8dd73193c3da8e70ae5cb1119312c4533a 100644
139--- a/plugins/svn/svn.plugin.zsh
140+++ b/plugins/svn/svn.plugin.zsh
141@@ -16,7 +16,7 @@ function svn_get_repo_name {
142 if [ $(in_svn) ]; then
143 svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
144
145- svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
146+ svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
147 fi
148 }
149
150diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
151index 524aa509d5bf5525ecc6b4e5ac3e879e1b5fb98b..bbd705a1e8de80152e3577f1e3bd854b58e2185d 100644
152--- a/tools/check_for_upgrade.sh
153+++ b/tools/check_for_upgrade.sh
154@@ -23,7 +23,7 @@ then
155 fi
156
157 epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
158- if [ $epoch_diff -gt 6 ]
159+ if [ $epoch_diff -gt 13 ]
160 then
161 if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
162 then