0608bb768fea1222410c5bd9b576bb1098409ffa

  1diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
  2index 0824814663aace41444cccdd32af88c69a7d6ca5..f7363feb82edd340c03d0571b6a6f1b0d77a05b8 100644
  3--- a/plugins/ubuntu/ubuntu.plugin.zsh
  4+++ b/plugins/ubuntu/ubuntu.plugin.zsh
  5@@ -5,18 +5,21 @@
  6 # https://github.com/trinaldi
  7 # Nicolas Jonas nextgenthemes.com
  8 # https://github.com/loctauxphilippe
  9+# https://github.com/HaraldNordgren
 10 #
 11 # Debian, Ubuntu and friends related zsh aliases and functions for zsh
 12 
 13+(( $+commands[apt] )) && APT=apt || APT=apt-get
 14+
 15 alias acs='apt-cache search'
 16 compdef _acs acs='apt-cache search'
 17 
 18 alias afs='apt-file search --regexp'
 19 compdef _afs afs='apt-file search --regexp'
 20 
 21-# These are apt-get only
 22-alias ags='apt-get source'   # asrc
 23-compdef _ags ags='apt-get source'
 24+# These are apt/apt-get only
 25+alias ags="$APT source"   # asrc
 26+compdef _ags ags="$APT source"
 27 
 28 alias acp='apt-cache policy' # app
 29 compdef _acp acp='apt-cache policy'
 30@@ -37,33 +40,33 @@ compdef _afu afu='sudo apt-file update'
 31 alias ppap='sudo ppa-purge'
 32 compdef _ppap ppap='sudo ppa-purge'
 33 
 34-alias apg='sudo apt-get'            # age - but without sudo
 35-alias aga='sudo apt-get autoclean' # aac
 36-alias agb='sudo apt-get build-dep' # abd
 37-alias agc='sudo apt-get clean'     # adc
 38-alias agd='sudo apt-get dselect-upgrade' # ads
 39-alias agi='sudo apt-get install'  # ai
 40-alias agp='sudo apt-get purge'    # ap
 41-alias agr='sudo apt-get remove'   # ar
 42-alias agu='sudo apt-get update'   # ad
 43-alias agud='sudo apt-get update && sudo apt-get full-upgrade' #adu
 44-alias agug='sudo apt-get upgrade' # ag
 45-alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
 46-alias agar='sudo apt-get autoremove'
 47-
 48-compdef _ag apg='sudo apt-get'
 49-compdef _aga aga='sudo apt-get autoclean'
 50-compdef _agb agb='sudo apt-get build-dep'
 51-compdef _agc agc='sudo apt-get clean'
 52-compdef _agd agd='sudo apt-get dselect-upgrade'
 53-compdef _agi agi='sudo apt-get install'
 54-compdef _agp agp='sudo apt-get purge'
 55-compdef _agr agr='sudo apt-get remove'
 56-compdef _agu agu='sudo apt-get update'
 57-compdef _agud agud='sudo apt-get update && sudo apt-get full-upgrade'
 58-compdef _agug agug='sudo apt-get upgrade'
 59-compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade'
 60-compdef _agar agar='sudo apt-get autoremove'
 61+alias ag="sudo $APT"               # age - but without sudo
 62+alias aga="sudo $APT autoclean"    # aac
 63+alias agb="sudo $APT build-dep"    # abd
 64+alias agc="sudo $APT clean"        # adc
 65+alias agd="sudo $APT dselect-upgrade" # ads
 66+alias agi="sudo $APT install"      # ai
 67+alias agp="sudo $APT purge"        # ap
 68+alias agr="sudo $APT remove"       # ar
 69+alias agu="sudo $APT update"       # ad
 70+alias agud="sudo $APT update && sudo $APT dist-upgrade" #adu
 71+alias agug="sudo $APT upgrade"     # ag
 72+alias aguu="sudo $APT update && sudo $APT upgrade"      #adg
 73+alias agar="sudo $APT autoremove"
 74+
 75+compdef _ag ag="sudo $APT"
 76+compdef _aga aga="sudo $APT autoclean"
 77+compdef _agb agb="sudo $APT build-dep"
 78+compdef _agc agc="sudo $APT clean"
 79+compdef _agd agd="sudo $APT dselect-upgrade"
 80+compdef _agi agi="sudo $APT install"
 81+compdef _agp agp="sudo $APT purge"
 82+compdef _agr agr="sudo $APT remove"
 83+compdef _agu agu="sudo $APT update"
 84+compdef _agud agud="sudo $APT update && sudo $APT dist-upgrade"
 85+compdef _agug agug="sudo $APT upgrade"
 86+compdef _aguu aguu="sudo $APT update && sudo $APT upgrade"
 87+compdef _agar agar="sudo $APT autoremove"
 88 
 89 # Remove ALL kernel images and headers EXCEPT the one in use
 90 alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
 91@@ -91,8 +94,8 @@ aar() {
 92 		PACKAGE=${1##*/}
 93 	fi
 94 	
 95-	sudo apt-add-repository $1 && sudo apt-get update
 96-	sudo apt-get install $PACKAGE
 97+	sudo apt-add-repository $1 && sudo $APT update
 98+	sudo $APT install $PACKAGE
 99 }
100 
101 # Prints apt history