9f8801bea6120817bc4f03f9d80dc1230ea7b2b0
- Author
- Jeff M. Hubbard <jeffmhubbard@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
2index 8dd1917607dd2b2dbef0e0b2045e8a3b766d2aac..d6b41ee40fc0013cd05ab9198d6fc46f4bcb8756 100644
3--- a/plugins/archlinux/README.md
4+++ b/plugins/archlinux/README.md
5@@ -26,13 +26,13 @@ plugins=(... archlinux)
6 | pacrep | `pacman -Si` | Display information about a package in the repositories |
7 | pacreps | `pacman -Ss` | Search for packages in the repositories |
8 | pacrmorphans | `sudo pacman -Rs $(pacman -Qtdq)` | Delete all orphaned packages |
9-| pacupd | `sudo pacman -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
10+| pacupd | `sudo pacman -Sy` | Update and refresh local package, ABS and AUR databases |
11 | pacupg | `sudo pacman -Syu` | Sync with repositories before upgrading packages |
12 | pacfileupg | `sudo pacman -Fy` | Download fresh package databases from the server |
13 | pacfiles | `pacman -F` | Search package file names for matching strings |
14 | pacls | `pacman -Ql` | List files in a package |
15 | pacown | `pacman -Qo` | Show which package owns a file |
16-| upgrade[³](#f3) | `sudo pacman -Syu` | Sync with repositories before upgrading packages |
17+| upgrade[²](#f2) | `sudo pacman -Syu` | Sync with repositories before upgrading packages |
18
19 | Function | Description |
20 |----------------|-----------------------------------------------------------|
21@@ -70,10 +70,10 @@ upgrades were available. Use `pacman -Que` instead.
22 | aurrep | `aura -Ai` | Display information about a package from AUR |
23 | aureps | `aura -As --both` | Search for packages in the repositories and AUR |
24 | auras | `aura -As --both` | Same as above |
25-| auupd | `sudo aura -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
26+| auupd | `sudo aura -Sy` | Update and refresh local package, ABS and AUR databases |
27 | auupg | `sudo sh -c "aura -Syu && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too) |
28 | ausu | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation |
29-| upgrade[³](#f3) | `sudo aura -Syu` | Sync with repositories before upgrading packages |
30+| upgrade[²](#f2) | `sudo aura -Syu` | Sync with repositories before upgrading packages |
31
32 | Function | Description |
33 |-----------------|---------------------------------------------------------------------|
34@@ -96,10 +96,10 @@ upgrades were available. Use `pacman -Que` instead.
35 | parem | `pacaur -Rns` | Remove packages, including its settings and unneeded dependencies |
36 | parep | `pacaur -Si` | Display information about a package in the repositories |
37 | pareps | `pacaur -Ss` | Search for packages in the repositories |
38-| paupd | `pacaur -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
39+| paupd | `pacaur -Sy` | Update and refresh local package, ABS and AUR databases |
40 | paupg | `pacaur -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
41 | pasu | `pacaur -Syua --no-confirm` | Same as `paupg`, but without confirmation |
42-| upgrade[³](#f3) | `pacaur -Syu` | Sync with repositories before upgrading packages |
43+| upgrade[²](#f2) | `pacaur -Syu` | Sync with repositories before upgrading packages |
44
45 #### Trizen
46
47@@ -118,12 +118,12 @@ upgrades were available. Use `pacman -Que` instead.
48 | trrem | `trizen -Rns` | Remove packages, including its settings and unneeded dependencies |
49 | trrep | `trizen -Si` | Display information about a package in the repositories |
50 | trreps | `trizen -Ss` | Search for packages in the repositories |
51-| trupd | `trizen -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
52+| trupd | `trizen -Sy` | Update and refresh local package, ABS and AUR databases |
53 | trupg | `trizen -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
54 | trsu | `trizen -Syua --no-confirm` | Same as `trupg`, but without confirmation |
55-| upgrade[³](#f3) | `trizen -Syu` | Sync with repositories before upgrading packages |
56+| upgrade[²](#f2) | `trizen -Syu` | Sync with repositories before upgrading packages |
57
58-#### Yaourt[²](#f2)
59+#### Yaourt[¹](#f1)
60
61 | Alias | Command | Description |
62 |---------|-----------------------------------|---------------------------------------------------------------------|
63@@ -140,12 +140,12 @@ upgrades were available. Use `pacman -Que` instead.
64 | yarem | `yaourt -Rns` | Remove packages, including its settings and unneeded dependencies |
65 | yarep | `yaourt -Si` | Display information about a package in the repositories |
66 | yareps | `yaourt -Ss` | Search for packages in the repositories |
67-| yaupd | `yaourt -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
68+| yaupd | `yaourt -Sy` | Update and refresh local package, ABS and AUR databases |
69 | yaupg | `yaourt -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
70 | yasu | `yaourt -Syua --no-confirm` | Same as `yaupg`, but without confirmation |
71-| upgrade[³](#f3) | `yaourt -Syu` | Sync with repositories before upgrading packages |
72+| upgrade[²](#f2) | `yaourt -Syu` | Sync with repositories before upgrading packages |
73
74-#### Yay[²](#f2)
75+#### Yay[¹](#f1)
76
77 | Alias | Command | Description |
78 |---------|--------------------------------|-------------------------------------------------------------------|
79@@ -162,21 +162,17 @@ upgrades were available. Use `pacman -Que` instead.
80 | yarem | `yay -Rns` | Remove packages, including its settings and unneeded dependencies |
81 | yarep | `yay -Si` | Display information about a package in the repositories |
82 | yareps | `yay -Ss` | Search for packages in the repositories |
83-| yaupd | `yay -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases |
84+| yaupd | `yay -Sy` | Update and refresh local package, ABS and AUR databases |
85 | yaupg | `yay -Syu` | Sync with repositories before upgrading packages |
86 | yasu | `yay -Syu --no-confirm` | Same as `yaupg`, but without confirmation |
87-| upgrade[³](#f3) | `yay -Syu` | Sync with repositories before upgrading packages |
88+| upgrade[²](#f2) | `yay -Syu` | Sync with repositories before upgrading packages |
89
90 ---
91
92 <span id="f1">¹</span>
93-If the `abs` and/or `aur` commands are present, `sudo abs` and `sudo aur` are also
94-called to update the ABS and AUR databases.
95-
96-<span id="f2">²</span>
97 Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
98
99-<span id="f3">³</span>
100+<span id="f2">²</span>
101 The `upgrade` alias is set for all package managers. Its value will depend on
102 whether the package manager is installed, checked in the following order:
103
104@@ -199,3 +195,4 @@ whether the package manager is installed, checked in the following order:
105diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
106index 4c553d27166e4680864eee8146989411445989b9..c94fb8f6c7865c305af052eda328afed16c2c4fa 100644
107--- a/plugins/archlinux/archlinux.plugin.zsh
108+++ b/plugins/archlinux/archlinux.plugin.zsh
109@@ -2,12 +2,6 @@
110 # Pacman #
111 #######################################
112
113-# abs and aur command check
114-local abs_aur=''
115-(( ! $+commands[abs] )) || abs_aur+=' && sudo abs'
116-(( ! $+commands[aur] )) || abs_aur+=' && sudo aur'
117-
118-
119 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
120 alias pacupg='sudo pacman -Syu'
121 alias pacin='sudo pacman -S'
122@@ -26,7 +20,7 @@ alias pacfileupg='sudo pacman -Fy'
123 alias pacfiles='pacman -F'
124 alias pacls='pacman -Ql'
125 alias pacown='pacman -Qo'
126-alias pacupd="sudo pacman -Sy$abs_aur"
127+alias pacupd="sudo pacman -Sy"
128 alias upgrade='sudo pacman -Syu'
129
130 function paclist() {
131@@ -108,7 +102,7 @@ if (( $+commands[aura] )); then
132 alias aurrep='aura -Ai'
133 alias aureps='aura -As --both'
134 alias auras='aura -As --both'
135- alias auupd="sudo aura -Sy$abs_aur"
136+ alias auupd="sudo aura -Sy"
137 alias auupg='sudo sh -c "aura -Syu && aura -Au"'
138 alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
139 alias upgrade='sudo aura -Syu'
140@@ -135,7 +129,7 @@ if (( $+commands[pacaur] )); then
141 alias paorph='pacaur -Qtd'
142 alias painsd='pacaur -S --asdeps'
143 alias pamir='pacaur -Syy'
144- alias paupd="pacaur -Sy$abs_aur"
145+ alias paupd="pacaur -Sy"
146 alias upgrade='pacaur -Syu'
147 fi
148
149@@ -155,7 +149,7 @@ if (( $+commands[trizen] )); then
150 alias trorph='trizen -Qtd'
151 alias trinsd='trizen -S --asdeps'
152 alias trmir='trizen -Syy'
153- alias trupd="trizen -Sy$abs_aur"
154+ alias trupd="trizen -Sy"
155 alias upgrade='trizen -Syu'
156 fi
157
158@@ -175,7 +169,7 @@ if (( $+commands[yaourt] )); then
159 alias yaorph='yaourt -Qtd'
160 alias yainsd='yaourt -S --asdeps'
161 alias yamir='yaourt -Syy'
162- alias yaupd="yaourt -Sy$abs_aur"
163+ alias yaupd="yaourt -Sy"
164 alias upgrade='yaourt -Syu'
165 fi
166
167@@ -195,8 +189,7 @@ if (( $+commands[yay] )); then
168 alias yaorph='yay -Qtd'
169 alias yainsd='yay -S --asdeps'
170 alias yamir='yay -Syy'
171- alias yaupd="yay -Sy$abs_aur"
172+ alias yaupd="yay -Sy"
173 alias upgrade='yay -Syu'
174 fi
175
176-unset abs_aur