73b9f8311030fe249d703178d5cb445eb0642268

Author
Alexander Berezovsky <ab@plumdistrict.com>
Committer
Alexander Berezovsky <ab@plumdistrict.com>
Date

Message

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

Diff

 1diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
 2index e1f571237a74f75d5522b073e8cdbfaa9efc502a..2b80b76e679a37f29ef2559b5f6f1bf44a0aff5c 100644
 3--- a/plugins/bundler/bundler.plugin.zsh
 4+++ b/plugins/bundler/bundler.plugin.zsh
 5@@ -6,7 +6,7 @@ alias bu="bundle update"
 6 
 7 # The following is based on https://github.com/gma/bundler-exec
 8 
 9-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)
10+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)
11 
12 ## Functions
13 
14diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
15index 16a5d54cadb59c99533956e0f1f565531613aa6e..39d3ef36a05280e9e285412afecba861278bd73c 100644
16--- a/plugins/debian/debian.plugin.zsh
17+++ b/plugins/debian/debian.plugin.zsh
18@@ -40,20 +40,23 @@ alias ap='apt-cache policy'
19 # superuser operations ######################################################
20 if [[ $use_sudo -eq 1 ]]; then
21 # commands using sudo #######
22-    alias aac="sudo $apt_pref autoclean"
23-    alias abd="sudo $apt_pref build-dep"
24-    alias ac="sudo $apt_pref clean"
25-    alias ad="sudo $apt_pref update"
26-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
27-    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
28+    alias aac='sudo $apt_pref autoclean'
29+    alias abd='sudo $apt_pref build-dep'
30+    alias ac='sudo $apt_pref clean'
31+    alias ad='sudo $apt_pref update'
32+    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
33+    alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
34     alias afu='sudo apt-file update'
35-    alias ag="sudo $apt_pref upgrade"
36-    alias ai="sudo $apt_pref install"
37-    alias ap="sudo $apt_pref purge"
38-    alias ar="sudo $apt_pref remove"
39+    alias ag='sudo $apt_pref upgrade'
40+    alias ai='sudo $apt_pref install'
41+    # Install all packages given on the command line while using only the first word of each line:
42+    # acs ... | ail
43+    alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo $apt_pref install'
44+    alias ap='sudo $apt_pref purge'
45+    alias ar='sudo $apt_pref remove'
46 
47     # apt-get only
48-    alias ads="sudo $apt_pref dselect-upgrade"
49+    alias ads='sudo $apt_pref dselect-upgrade'
50 
51     # Install all .deb files in the current directory.
52     # Warning: you will need to put the glob in single quotes if you use:
53@@ -67,18 +70,18 @@ if [[ $use_sudo -eq 1 ]]; then
54 
55 # commands using su #########
56 else
57-    alias aac='su -ls "'"$apt_pref"' autoclean" root'
58+    alias aac='su -ls \'$apt_pref autoclean\' root'
59     abd() {
60         cmd="su -lc '$apt_pref build-dep $@' root"
61         print "$cmd"
62         eval "$cmd"
63     }
64-    alias ac='su -ls "'"$apt_pref"' clean" root'
65-    alias ad='su -lc "'"$apt_pref"' update" root'
66-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
67-    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
68+    alias ac='su -ls \'$apt_pref clean\' root'
69+    alias ad='su -lc \'$apt_pref update\' root'
70+    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
71+    alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
72     alias afu='su -lc "apt-file update"'
73-    alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
74+    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
75     ai() {
76         cmd="su -lc 'aptitude -P install $@' root"
77         print "$cmd"
78@@ -118,7 +121,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
79 apt-copy() {
80     print '#!/bin/sh'"\n" > apt-copy.sh
81 
82-    cmd="$apt_pref install "
83+    cmd='$apt_pref install'
84 
85     for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
86         cmd="${cmd} ${p}"
87diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
88index 524aa509d5bf5525ecc6b4e5ac3e879e1b5fb98b..bbd705a1e8de80152e3577f1e3bd854b58e2185d 100644
89--- a/tools/check_for_upgrade.sh
90+++ b/tools/check_for_upgrade.sh
91@@ -23,7 +23,7 @@ then
92   fi
93 
94   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
95-  if [ $epoch_diff -gt 6 ]
96+  if [ $epoch_diff -gt 13 ]
97   then
98     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
99     then