1876f1d5581e7b6907ead46a8371826db5eded49

Author
mapc <musikmichael@web.de>
Committer
mapc <musikmichael@web.de>
Date

Message

Make the $apt_pref variable evaluatet at alias expansion by using single-quotes instad of double quotes

Diff

 1diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
 2index 16a5d54cadb59c99533956e0f1f565531613aa6e..5b6e5cfd478eae98855113400353f8eb77542904 100644
 3--- a/plugins/debian/debian.plugin.zsh
 4+++ b/plugins/debian/debian.plugin.zsh
 5@@ -40,20 +40,20 @@ alias ap='apt-cache policy'
 6 # superuser operations ######################################################
 7 if [[ $use_sudo -eq 1 ]]; then
 8 # commands using sudo #######
 9-    alias aac="sudo $apt_pref autoclean"
10-    alias abd="sudo $apt_pref build-dep"
11-    alias ac="sudo $apt_pref clean"
12-    alias ad="sudo $apt_pref update"
13-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
14-    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
15+    alias aac='sudo $apt_pref autoclean'
16+    alias abd='sudo $apt_pref build-dep'
17+    alias ac='sudo $apt_pref clean'
18+    alias ad='sudo $apt_pref update'
19+    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
20+    alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
21     alias afu='sudo apt-file update'
22-    alias ag="sudo $apt_pref upgrade"
23-    alias ai="sudo $apt_pref install"
24-    alias ap="sudo $apt_pref purge"
25-    alias ar="sudo $apt_pref remove"
26+    alias ag='sudo $apt_pref upgrade'
27+    alias ai='sudo $apt_pref install'
28+    alias ap='sudo $apt_pref purge'
29+    alias ar='sudo $apt_pref remove'
30 
31     # apt-get only
32-    alias ads="sudo $apt_pref dselect-upgrade"
33+    alias ads='sudo $apt_pref dselect-upgrade'
34 
35     # Install all .deb files in the current directory.
36     # Warning: you will need to put the glob in single quotes if you use:
37@@ -67,18 +67,18 @@ if [[ $use_sudo -eq 1 ]]; then
38 
39 # commands using su #########
40 else
41-    alias aac='su -ls "'"$apt_pref"' autoclean" root'
42+    alias aac='su -ls \'$apt_pref autoclean\' root'
43     abd() {
44         cmd="su -lc '$apt_pref build-dep $@' root"
45         print "$cmd"
46         eval "$cmd"
47     }
48-    alias ac='su -ls "'"$apt_pref"' clean" root'
49-    alias ad='su -lc "'"$apt_pref"' update" root'
50-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
51-    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
52+    alias ac='su -ls \'$apt_pref clean\' root'
53+    alias ad='su -lc \'$apt_pref update\' root'
54+    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
55+    alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
56     alias afu='su -lc "apt-file update"'
57-    alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
58+    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
59     ai() {
60         cmd="su -lc 'aptitude -P install $@' root"
61         print "$cmd"
62@@ -118,7 +118,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
63 apt-copy() {
64     print '#!/bin/sh'"\n" > apt-copy.sh
65 
66-    cmd="$apt_pref install "
67+    cmd='$apt_pref install'
68 
69     for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
70         cmd="${cmd} ${p}"