From 26e9cead1a7c9264962986fdc3038ad7266c92bd Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 12 Jun 2021 14:10:06 +0000 Subject: [PATCH] feat(plugins): Plugin "debian": Switch order of "apt" and "aptitude" for detection (#7533) * Switch order of "apt" and "aptitude" for detection "apt" is installed by default at Debian (maybe Ubuntu too), while "aptitude" does not seem to be installed by default. For that, it may be better for most of the users to prefer "aptitude" if installed. * plugins/debian/README: Change of order mirroded into documentation --- plugins/debian/README.md | 2 +- plugins/debian/debian.plugin.zsh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/debian/README.md b/plugins/debian/README.md index da5675c66..922d68cb3 100644 --- a/plugins/debian/README.md +++ b/plugins/debian/README.md @@ -10,7 +10,7 @@ plugins=(... debian) ## Settings -- `$apt_pref`: use apt or aptitude if installed, fallback is apt-get. +- `$apt_pref`: use aptitude or apt if installed, fallback is apt-get. - `$apt_upgr`: use upgrade or safe-upgrade (for aptitude). Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior. diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh index 108396784..bde97cd30 100644 --- a/plugins/debian/debian.plugin.zsh +++ b/plugins/debian/debian.plugin.zsh @@ -1,13 +1,13 @@ -# Use apt or aptitude if installed, fallback is apt-get +# Use aptitude or apt if installed, fallback is apt-get # You can just set apt_pref='apt-get' to override it. if [[ -z $apt_pref || -z $apt_upgr ]]; then - if [[ -e $commands[apt] ]]; then - apt_pref='apt' - apt_upgr='upgrade' - elif [[ -e $commands[aptitude] ]]; then + if [[ -e $commands[aptitude] ]]; then apt_pref='aptitude' apt_upgr='safe-upgrade' + elif [[ -e $commands[apt] ]]; then + apt_pref='apt' + apt_upgr='upgrade' else apt_pref='apt-get' apt_upgr='upgrade'