diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-07-11 19:58:51 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-07-11 19:58:51 -0600 |
| commit | 617ed3bd9f3d9519fe2354941f3dbf15b0c712ee (patch) | |
| tree | caf617b35d3f5f7b5786483eedfcda9361dca108 /plugins/debian | |
| parent | 0144641b7d8e4e6ff6ce153039b5a827f5347904 (diff) | |
| parent | 36f444ed7325720ec05f182781ec7d6c9a4d675c (diff) | |
| download | zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.tar.gz zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.tar.bz2 zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/debian')
| -rw-r--r-- | plugins/debian/README.md | 2 | ||||
| -rw-r--r-- | 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' |