ubuntu: plugin cleanup and rename of ag alias to age (#7700)

* Clean up plugin and README
* Rename ag to age to avoid conflict with The Silver Searcher
  Fixes #3866

plugins/ubuntu/README.md

@@ -10,15 +10,15 @@ plugins=(... ubuntu)
 
 ## Aliases
 
-Commands that use `$APT` will use apt if installed or defer to apt-get otherwise. 
+Commands that use `$APT` will use `apt` if installed or defer to `apt-get` otherwise.
 
 | Alias   | Command                                                                  | Description                                                                                       |
-|---------|------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+|---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| age     | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |
-| ag      | `sudo $APT`                                                            | Run apt-get with sudo                                                                             | 
 | aga     | `sudo $APT autoclean`                                                    | Clears out the local reposityory of retrieved package files that can no longer be downloaded      |
 | agb     | `sudo $APT build-dep <source_pkg>`                                       | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    |
 | agc     | `sudo $APT clean`                                                        | Clears out the local repository of retrieved package files leaving everything from the lock files |
@@ -49,4 +49,12 @@ Commands that use `$APT` will use apt if installed or defer to apt-get otherwise
 | apt-list-packages | `apt-list-packages`                   | List packages by size                                                    |
 | kerndeb           | `kerndeb`                             | Kernel-package building shortcut                                         |
 
+## Authors:
 
+- [@AlexBio](https://github.com/AlexBio)
+- [@dbb](https://github.com/dbb)
+- [@Mappleconfusers](https://github.com/Mappleconfusers)
+- [@trinaldi](https://github.com/trinaldi)
+- [Nicolas Jonas](https://nextgenthemes.com)
+- [@loctauxphilippe](https://github.com/loctauxphilippe)
+- [@HaraldNordgren](https://github.com/HaraldNordgren)

plugins/ubuntu/ubuntu.plugin.zsh

@@ -1,76 +1,43 @@
-# Authors:
-# https://github.com/AlexBio
-# https://github.com/dbb
-# https://github.com/Mappleconfusers
-# https://github.com/trinaldi
-# Nicolas Jonas nextgenthemes.com
-# https://github.com/loctauxphilippe
-# https://github.com/HaraldNordgren
-#
-# Debian, Ubuntu and friends related zsh aliases and functions for zsh
-
 (( $+commands[apt] )) && APT=apt || APT=apt-get
 
 alias acs='apt-cache search'
-compdef _acs acs='apt-cache search'
 
 alias afs='apt-file search --regexp'
-compdef _afs afs='apt-file search --regexp'
 
 # These are apt/apt-get only
-alias ags="$APT source"   # asrc
+alias ags="$APT source"
-compdef _ags ags="$APT source"
 
-alias acp='apt-cache policy' # app
+alias acp='apt-cache policy'
-compdef _acp acp='apt-cache policy'
 
 #List all installed packages
 alias agli='apt list --installed'
-compdef _agli agli='apt list --installed'
 
 # superuser operations ######################################################
 
 # List available updates only
 alias aglu='sudo apt-get -u upgrade --assume-no'
-compdef _aglu aglu='sudo apt-get -u upgrade --assume-no'
 
 alias afu='sudo apt-file update'
-compdef _afu afu='sudo apt-file update'
 
 alias ppap='sudo ppa-purge'
-compdef _ppap ppap='sudo ppa-purge'
 
-alias ag="sudo $APT"               # age - but without sudo
+alias age="sudo $APT"
-alias aga="sudo $APT autoclean"    # aac
+alias aga="sudo $APT autoclean"
-alias agb="sudo $APT build-dep"    # abd
+alias agb="sudo $APT build-dep"
-alias agc="sudo $APT clean"        # adc
+alias agc="sudo $APT clean"
-alias agd="sudo $APT dselect-upgrade" # ads
+alias agd="sudo $APT dselect-upgrade"
-alias agi="sudo $APT install"      # ai
+alias agi="sudo $APT install"
-alias agp="sudo $APT purge"        # ap
+alias agp="sudo $APT purge"
-alias agr="sudo $APT remove"       # ar
+alias agr="sudo $APT remove"
-alias agu="sudo $APT update"       # ad
+alias agu="sudo $APT update"
-alias agud="sudo $APT update && sudo $APT dist-upgrade" #adu
+alias agud="sudo $APT update && sudo $APT dist-upgrade"
-alias agug="sudo $APT upgrade"     # ag
+alias agug="sudo $APT upgrade"
-alias aguu="sudo $APT update && sudo $APT upgrade"      #adg
+alias aguu="sudo $APT update && sudo $APT upgrade"
 alias agar="sudo $APT autoremove"
 
-compdef _ag ag="sudo $APT"
-compdef _aga aga="sudo $APT autoclean"
-compdef _agb agb="sudo $APT build-dep"
-compdef _agc agc="sudo $APT clean"
-compdef _agd agd="sudo $APT dselect-upgrade"
-compdef _agi agi="sudo $APT install"
-compdef _agp agp="sudo $APT purge"
-compdef _agr agr="sudo $APT remove"
-compdef _agu agu="sudo $APT update"
-compdef _agud agud="sudo $APT update && sudo $APT dist-upgrade"
-compdef _agug agug="sudo $APT upgrade"
-compdef _aguu aguu="sudo $APT update && sudo $APT upgrade"
-compdef _agar agar="sudo $APT autoremove"
 
 # Remove ALL kernel images and headers EXCEPT the one in use
-alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
+alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'
-	?not(~n`uname -r`))'
 
 # Misc. #####################################################################
 # print all installed packages
@@ -139,7 +106,7 @@ kerndeb () {
   # temporarily unset MAKEFLAGS ( '-j3' will fail )
   MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
   print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
-	appendage='-custom' # this shows up in $ (uname -r )
+  appendage='-custom' # this shows up in $(uname -r)
   revision=$(date +"%Y%m%d") # this shows up in the .deb file name
 
   make-kpkg clean