65393b4bb10de841edbe2026dba29b73625b33d7

Message

Extend root ops, switch apt-copy to plain zsh

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
  2index 1df91dc4a591226b6708f47c020962088cfdb524..23cb98f938f51682fc323fa17c1c86d2c0d1fc34 100644
  3--- a/plugins/debian/debian.plugin.zsh
  4+++ b/plugins/debian/debian.plugin.zsh
  5@@ -4,8 +4,13 @@
  6 #
  7 # Debian-related zsh aliases and functions for zsh
  8 
  9-# Set to 'apt-get' or 'aptitude'
 10-apt_pref='aptitude'
 11+# Use aptitude if installed, or apt-get if not.
 12+# You can just set apt_pref='apt-get' to override it.
 13+if [[ -e $( which aptitude ) ]]; then
 14+    apt_pref='aptitude'
 15+else
 16+    apt_pref='apt-get'
 17+fi
 18 
 19 # Use sudo by default if it's installed
 20 if [[ -e $( which sudo ) ]]; then
 21@@ -13,6 +18,10 @@ if [[ -e $( which sudo ) ]]; then
 22 fi
 23 
 24 # Aliases ###################################################################
 25+# These are for more obscure uses of apt-get and aptitude that aren't covered
 26+# below.
 27+alias ag='apt-get'
 28+alias at='aptitude'
 29 
 30 # Some self-explanatory aliases
 31 alias acs="apt-cache search"
 32@@ -28,19 +37,23 @@ alias afs='apt-file search --regexp'
 33 alias asrc='apt-get source'
 34 alias ap='apt-cache policy'
 35 
 36-# superuser operations ################
 37+# superuser operations ######################################################
 38 if [[ $use_sudo -eq 1 ]]; then
 39-    alias ai="sudo $apt_pref install"
 40+# commands using sudo #######
 41+    alias aac="sudo $apt_pref autoclean"
 42+    alias abd="sudo $apt_pref build-dep"
 43+    alias ac="sudo $apt_pref clean"
 44     alias ad="sudo $apt_pref update"
 45+    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
 46+    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
 47     alias afu='sudo apt-file update'
 48     alias ag="sudo $apt_pref upgrade"
 49-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
 50+    alias ai="sudo $apt_pref install"
 51     alias ap="sudo $apt_pref purge"
 52     alias ar="sudo $apt_pref remove"
 53 
 54-    if [[ $apt_pref -eq 'apt-get' ]]; then
 55-        alias ads="sudo $apt_pref dselect-upgrade"
 56-    fi
 57+    # apt-get only
 58+    alias ads="sudo $apt_pref dselect-upgrade"
 59     
 60     # Install all .deb files in the current directory.
 61     # Warning: you will need to put the glob in single quotes if you use:
 62@@ -48,25 +61,54 @@ if [[ $use_sudo -eq 1 ]]; then
 63     alias di='sudo dpkg -i ./*.deb'
 64 
 65     # Remove ALL kernel images and headers EXCEPT the one in use
 66-    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'
 67+    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
 68+        ?not(~n`uname -r`))'
 69+
 70+
 71+# commands using su #########
 72 else
 73-    alias ai='apin' 
 74+    alias aac='su -ls "'"$apt_pref"' autoclean" root'
 75+    abd() {
 76+        cmd="su -lc '$apt_pref build-dep $@' root"
 77+        print "$cmd"
 78+        eval "$cmd"
 79+    }
 80+    alias ac='su -ls "'"$apt_pref"' clean" root'
 81     alias ad='su -lc "'"$apt_pref"' update" root'
 82+    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
 83+    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
 84     alias afu='su -lc "apt-file update"'
 85     alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
 86-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
 87+    ai() {
 88+        cmd="su -lc 'aptitude -P install $@' root"
 89+        print "$cmd"
 90+        eval "$cmd"
 91+    }
 92+    ap() {
 93+        cmd="su -lc '$apt_pref -P purge $@' root"
 94+        print "$cmd"
 95+        eval "$cmd"
 96+    }
 97+    ar() {
 98+        cmd="su -lc '$apt_pref -P remove $@' root"
 99+        print "$cmd"
100+        eval "$cmd"
101+    }
102+
103+    # Install all .deb files in the current directory
104+    # Assumes glob_subst is off