From e4237f436bdeb1a55236e3aacf7b7c556d604864 Mon Sep 17 00:00:00 2001 From: Michele Bologna Date: Tue, 14 Jun 2016 14:17:25 +0200 Subject: [PATCH] Remove clashing with 'ag' (the_silver_searcher) This plugin define an alias named 'ag'. However, on Ubuntu systems, when you install the_silver_searcher it is automatically installed as `/usr/bin/ag`. This patch changed the alias from 'ag' (`sudo apt-get update`) to 'sag' to avoid name clashing. Other aliases are updated accordingly. Signed-off-by: Michele Bologna --- plugins/ubuntu/readme.md | 14 +++---- plugins/ubuntu/ubuntu.plugin.zsh | 64 ++++++++++++++++---------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md index c9ef61f4e..543253a56 100644 --- a/plugins/ubuntu/readme.md +++ b/plugins/ubuntu/readme.md @@ -3,19 +3,19 @@ This plugin was created because the aliases in the debian plugin are inconsisten acs = Apt-Cache Search acp = Apt-Cache Policy -ag = sudo Apt-Get -agi = sudo Apt-Get Install -agd = sudo Apt-Get Dselect-upgrade +sag = sudo Apt-Get +sagi = sudo Apt-Get Install +sagd = sudo Apt-Get Dselect-upgrade By now you already can guess almost all aliases There are two exeptions since ... -agu = sudo Apt-Get Update - we have ... -agug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command. +sagu = sudo Apt-Get Update - we have ... +sagug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command. afs = Apt-File Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command. Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember. -aguu = sudo Apt-Get Update && sudo apt-get Upgrade - better then adg or not? -agud = sudo Apt-Get Update && sudo apt-get Dist-upgrade +saguu = sudo Apt-Get Update && sudo apt-get Upgrade - better then adg or not? +sagud = sudo Apt-Get Update && sudo apt-get Dist-upgrade For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/ubuntu/ubuntu.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command. diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh index f08853643..8cdb234ad 100644 --- a/plugins/ubuntu/ubuntu.plugin.zsh +++ b/plugins/ubuntu/ubuntu.plugin.zsh @@ -21,41 +21,41 @@ alias acp='apt-cache policy' # app compdef _acp acp='apt-cache policy' # superuser operations ###################################################### -alias afu='sudo apt-file update' -compdef _afu afu='sudo apt-file update' +alias safu='sudo apt-file update' +compdef _safu safu='sudo apt-file update' -alias ppap='sudo ppa-purge' -compdef _ppap ppap='sudo ppa-purge' +alias sppap='sudo ppa-purge' +compdef _sppap sppap='sudo ppa-purge' -alias ag='sudo apt-get' # age - but without sudo -alias aga='sudo apt-get autoclean' # aac -alias agar='sudo apt-get autoremove' -alias agb='sudo apt-get build-dep' # abd -alias agc='sudo apt-get clean' # adc -alias agd='sudo apt-get dselect-upgrade' # ads -alias agi='sudo apt-get install' # ai -alias agp='sudo apt-get purge' # ap -alias agr='sudo apt-get remove' # ar -alias agu='sudo apt-get update' # ad -alias agud='sudo apt-get update && sudo apt-get dist-upgrade' #adu -alias agug='sudo apt-get upgrade' # ag -alias aguu='sudo apt-get update && sudo apt-get upgrade' #adg -alias agar='sudo apt-get autoremove' +alias sag='sudo apt-get' # age - but without sudo +alias saga='sudo apt-get autoclean' # aac +alias sagar='sudo apt-get autoremove' +alias sagb='sudo apt-get build-dep' # abd +alias sagc='sudo apt-get clean' # adc +alias sagd='sudo apt-get dselect-upgrade' # ads +alias sagi='sudo apt-get install' # ai +alias sagp='sudo apt-get purge' # ap +alias sagr='sudo apt-get remove' # ar +alias sagu='sudo apt-get update' # ad +alias sagud='sudo apt-get update && sudo apt-get dist-upgrade' #adu +alias sagug='sudo apt-get upgrade' # ag +alias saguu='sudo apt-get update && sudo apt-get upgrade' #adg +alias sagar='sudo apt-get autoremove' -compdef _ag ag='sudo apt-get' -compdef _aga aga='sudo apt-get autoclean' -compdef _agar agar='sudo apt-get autoremove' -compdef _agb agb='sudo apt-get build-dep' -compdef _agc agc='sudo apt-get clean' -compdef _agd agd='sudo apt-get dselect-upgrade' -compdef _agi agi='sudo apt-get install' -compdef _agp agp='sudo apt-get purge' -compdef _agr agr='sudo apt-get remove' -compdef _agu agu='sudo apt-get update' -compdef _agud agud='sudo apt-get update && sudo apt-get dist-upgrade' -compdef _agug agug='sudo apt-get upgrade' -compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade' -compdef _agar agar='sudo apt-get autoremove' +compdef _sag sag='sudo apt-get' +compdef _saga saga='sudo apt-get autoclean' +compdef _sagar sagar='sudo apt-get autoremove' +compdef _sagb sagb='sudo apt-get build-dep' +compdef _sagc sagc='sudo apt-get clean' +compdef _sagd sagd='sudo apt-get dselect-upgrade' +compdef _sagi sagi='sudo apt-get install' +compdef _sagp sagp='sudo apt-get purge' +compdef _sagr sagr='sudo apt-get remove' +compdef _sagu sagu='sudo apt-get update' +compdef _sagud sagud='sudo apt-get update && sudo apt-get dist-upgrade' +compdef _sagug sagug='sudo apt-get upgrade' +compdef _saguu saguu='sudo apt-get update && sudo apt-get upgrade' +compdef _sagar sagar='sudo apt-get autoremove' # Remove ALL kernel images and headers EXCEPT the one in use alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \