diff options
| author | Robby Russell <robby@planetargon.com> | 2015-06-14 22:27:59 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-06-14 22:27:59 -0700 |
| commit | 7daf7401b9301f79cc7c4f0cdb92a5e01a3c76b6 (patch) | |
| tree | 03a27b22c6ec78b02d1bc5eff1d11b38b7bc9aeb /plugins/debian | |
| parent | 0665ece7bd8523ef501991cda9963e9efc42ea6a (diff) | |
| parent | 4d0aca48dace8cc4952aeb3c266837b993133a1c (diff) | |
| download | zsh-7daf7401b9301f79cc7c4f0cdb92a5e01a3c76b6.tar.gz zsh-7daf7401b9301f79cc7c4f0cdb92a5e01a3c76b6.tar.bz2 zsh-7daf7401b9301f79cc7c4f0cdb92a5e01a3c76b6.zip | |
Merge pull request #3874 from diraol/patch-2
Debian Plugin: Differing upgrade and safe-upgrade
Diffstat (limited to 'plugins/debian')
| -rw-r--r-- | plugins/debian/debian.plugin.zsh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh index 6e45e0521..31a772d60 100644 --- a/plugins/debian/debian.plugin.zsh +++ b/plugins/debian/debian.plugin.zsh @@ -9,8 +9,10 @@ # You can just set apt_pref='apt-get' to override it. if [[ -e $( which -p aptitude 2>&1 ) ]]; then apt_pref='aptitude' + apt_upgr='safe-upgrade' else apt_pref='apt-get' + apt_upgr='upgrade' fi # Use sudo by default if it's installed @@ -45,10 +47,10 @@ if [[ $use_sudo -eq 1 ]]; then alias abd='sudo $apt_pref build-dep' alias ac='sudo $apt_pref clean' alias ad='sudo $apt_pref update' - alias adg='sudo $apt_pref update && sudo $apt_pref upgrade' + alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr' alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade' alias afu='sudo apt-file update' - alias ag='sudo $apt_pref upgrade' + alias ag='sudo $apt_pref $apt_upgr' alias ai='sudo $apt_pref install' # Install all packages given on the command line while using only the first word of each line: # acs ... | ail @@ -80,10 +82,10 @@ else } alias ac='su -ls \'$apt_pref clean\' root' alias ad='su -lc \'$apt_pref update\' root' - alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root' + alias adg='su -lc \'$apt_pref update && aptitude $apt_upgr\' root' alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root' alias afu='su -lc "apt-file update"' - alias ag='su -lc \'$apt_pref safe-upgrade\' root' + alias ag='su -lc \'$apt_pref $apt_upgr\' root' ai() { cmd="su -lc 'aptitude -P install $@' root" print "$cmd" @@ -136,7 +138,7 @@ apt_pref_compdef abd "build-dep" apt_pref_compdef ac "clean" apt_pref_compdef ad "update" apt_pref_compdef afu "update" -apt_pref_compdef ag "upgrade" +apt_pref_compdef ag "$apt_upgr" apt_pref_compdef ai "install" apt_pref_compdef ail "install" apt_pref_compdef ap "purge" |