Merge remote branch 'upstream/master'

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
-

plugins/bundler/bundler.plugin.zsh

@@ -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 rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+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)
 
 ## Functions
 

plugins/debian/debian.plugin.zsh

@@ -40,20 +40,23 @@ alias ap='apt-cache policy'
 # superuser operations ######################################################
 if [[ $use_sudo -eq 1 ]]; then
 # commands using sudo #######
-    alias aac="sudo $apt_pref autoclean"
-    alias abd="sudo $apt_pref build-dep"
-    alias ac="sudo $apt_pref clean"
-    alias ad="sudo $apt_pref update"
-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
-    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
+    alias aac='sudo $apt_pref autoclean'
+    alias abd='sudo $apt_pref build-dep'
+    alias ac='sudo $apt_pref clean'
+    alias ad='sudo $apt_pref update'
+    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
+    alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
     alias afu='sudo apt-file update'
-    alias ag="sudo $apt_pref upgrade"
-    alias ai="sudo $apt_pref install"
-    alias ap="sudo $apt_pref purge"
-    alias ar="sudo $apt_pref remove"
+    alias ag='sudo $apt_pref upgrade'
+    alias ai='sudo $apt_pref install'
+    # Install all packages given on the command line while using only the first word of each line:
+    # acs ... | ail
+    alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo $apt_pref install'
+    alias ap='sudo $apt_pref purge'
+    alias ar='sudo $apt_pref remove'
 
     # apt-get only
-    alias ads="sudo $apt_pref dselect-upgrade"
+    alias ads='sudo $apt_pref dselect-upgrade'
 
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
@@ -67,18 +70,18 @@ if [[ $use_sudo -eq 1 ]]; then
 
 # commands using su #########
 else
-    alias aac='su -ls "'"$apt_pref"' autoclean" root'
+    alias aac='su -ls \'$apt_pref autoclean\' root'
     abd() {
         cmd="su -lc '$apt_pref build-dep $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    alias ac='su -ls "'"$apt_pref"' clean" root'
-    alias ad='su -lc "'"$apt_pref"' update" root'
-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
-    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
+    alias ac='su -ls \'$apt_pref clean\' root'
+    alias ad='su -lc \'$apt_pref update\' root'
+    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
+    alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
     alias afu='su -lc "apt-file update"'
-    alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
+    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
     ai() {
         cmd="su -lc 'aptitude -P install $@' root"
         print "$cmd"
@@ -118,7 +121,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 apt-copy() {
     print '#!/bin/sh'"\n" > apt-copy.sh
 
-    cmd="$apt_pref install "
+    cmd='$apt_pref install'
 
     for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
         cmd="${cmd} ${p}"

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"'

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 .'

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
 }
 

tools/check_for_upgrade.sh

@@ -23,7 +23,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 6 ]
+  if [ $epoch_diff -gt 13 ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then