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

This commit is contained in:
Alexander Berezovsky 2012-06-04 16:21:16 +03:00
commit 73b9f83110
3 changed files with 23 additions and 20 deletions

View file

@ -6,7 +6,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec # 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 ## Functions

View file

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

View file

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