4d0aca48dace8cc4952aeb3c266837b993133a1c

Author
Diego Rabatone Oliveira <diraol@diraol.eng.br>
Committer
Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date

Message

Differing upgrade and safe-upgrade

Improving with "safe-upgrade" for aptitude and "upgrade" for apt-get

Diff

 1diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
 2index 6e45e05216359a9a413a61d989ef919b00e4e9a3..31a772d604be52e7737410fb3b9aa943ef41d5be 100644
 3--- a/plugins/debian/debian.plugin.zsh
 4+++ b/plugins/debian/debian.plugin.zsh
 5@@ -9,8 +9,10 @@
 6 # You can just set apt_pref='apt-get' to override it.
 7 if [[ -e $( which -p aptitude 2>&1 ) ]]; then
 8     apt_pref='aptitude'
 9+    apt_upgr='safe-upgrade'
10 else
11     apt_pref='apt-get'
12+    apt_upgr='upgrade'
13 fi
14 
15 # Use sudo by default if it's installed
16@@ -45,10 +47,10 @@ if [[ $use_sudo -eq 1 ]]; then
17     alias abd='sudo $apt_pref build-dep'
18     alias ac='sudo $apt_pref clean'
19     alias ad='sudo $apt_pref update'
20-    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
21+    alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr'
22     alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
23     alias afu='sudo apt-file update'
24-    alias ag='sudo $apt_pref upgrade'
25+    alias ag='sudo $apt_pref $apt_upgr'
26     alias ai='sudo $apt_pref install'
27     # Install all packages given on the command line while using only the first word of each line:
28     # acs ... | ail
29@@ -80,10 +82,10 @@ else
30     }
31     alias ac='su -ls \'$apt_pref clean\' root'
32     alias ad='su -lc \'$apt_pref update\' root'
33-    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
34+    alias adg='su -lc \'$apt_pref update && aptitude $apt_upgr\' root'
35     alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
36     alias afu='su -lc "apt-file update"'
37-    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
38+    alias ag='su -lc \'$apt_pref $apt_upgr\' root'
39     ai() {
40         cmd="su -lc 'aptitude -P install $@' root"
41         print "$cmd"
42@@ -136,7 +138,7 @@ apt_pref_compdef abd "build-dep"
43 apt_pref_compdef ac  "clean"
44 apt_pref_compdef ad  "update"
45 apt_pref_compdef afu "update"
46-apt_pref_compdef ag  "upgrade"
47+apt_pref_compdef ag  "$apt_upgr"
48 apt_pref_compdef ai  "install"
49 apt_pref_compdef ail "install"
50 apt_pref_compdef ap  "purge"