Diff
1diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
2index d6b41ee40fc0013cd05ab9198d6fc46f4bcb8756..c8ec1de1e3c3921902e5b4af1977ecc358f19714 100644
3--- a/plugins/archlinux/README.md
4+++ b/plugins/archlinux/README.md
5@@ -32,7 +32,7 @@ plugins=(... archlinux)
6 | pacfiles | `pacman -F` | Search package file names for matching strings |
7 | pacls | `pacman -Ql` | List files in a package |
8 | pacown | `pacman -Qo` | Show which package owns a file |
9-| upgrade[²](#f2) | `sudo pacman -Syu` | Sync with repositories before upgrading packages |
10+| upgrade[¹](#f1) | `sudo pacman -Syu` | Sync with repositories before upgrading packages |
11
12 | Function | Description |
13 |----------------|-----------------------------------------------------------|
14@@ -73,7 +73,7 @@ upgrades were available. Use `pacman -Que` instead.
15 | auupd | `sudo aura -Sy` | Update and refresh local package, ABS and AUR databases |
16 | auupg | `sudo sh -c "aura -Syu && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too) |
17 | ausu | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation |
18-| upgrade[²](#f2) | `sudo aura -Syu` | Sync with repositories before upgrading packages |
19+| upgrade[¹](#f1) | `sudo aura -Syu` | Sync with repositories before upgrading packages |
20
21 | Function | Description |
22 |-----------------|---------------------------------------------------------------------|
23@@ -99,7 +99,7 @@ upgrades were available. Use `pacman -Que` instead.
24 | paupd | `pacaur -Sy` | Update and refresh local package, ABS and AUR databases |
25 | paupg | `pacaur -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
26 | pasu | `pacaur -Syua --no-confirm` | Same as `paupg`, but without confirmation |
27-| upgrade[²](#f2) | `pacaur -Syu` | Sync with repositories before upgrading packages |
28+| upgrade[¹](#f1) | `pacaur -Syu` | Sync with repositories before upgrading packages |
29
30 #### Trizen
31
32@@ -121,31 +121,9 @@ upgrades were available. Use `pacman -Que` instead.
33 | trupd | `trizen -Sy` | Update and refresh local package, ABS and AUR databases |
34 | trupg | `trizen -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
35 | trsu | `trizen -Syua --no-confirm` | Same as `trupg`, but without confirmation |
36-| upgrade[²](#f2) | `trizen -Syu` | Sync with repositories before upgrading packages |
37+| upgrade[¹](#f1) | `trizen -Syu` | Sync with repositories before upgrading packages |
38
39-#### Yaourt[¹](#f1)
40-
41-| Alias | Command | Description |
42-|---------|-----------------------------------|---------------------------------------------------------------------|
43-| yaconf | `yaourt -C` | Fix all configuration files with vimdiff |
44-| yain | `yaourt -S` | Install packages from the repositories |
45-| yains | `yaourt -U` | Install a package from a local file |
46-| yainsd | `yaourt -S --asdeps` | Install packages as dependencies of another package |
47-| yaloc | `yaourt -Qi` | Display information about a package in the local database |
48-| yalocs | `yaourt -Qs` | Search for packages in the local database |
49-| yalst | `yaourt -Qe` | List installed packages including from AUR (tagged as "local") |
50-| yamir | `yaourt -Syy` | Force refresh of all package lists after updating mirrorlist |
51-| yaorph | `yaourt -Qtd` | Remove orphans using yaourt |
52-| yare | `yaourt -R` | Remove packages, keeping its settings and dependencies |
53-| yarem | `yaourt -Rns` | Remove packages, including its settings and unneeded dependencies |
54-| yarep | `yaourt -Si` | Display information about a package in the repositories |
55-| yareps | `yaourt -Ss` | Search for packages in the repositories |
56-| yaupd | `yaourt -Sy` | Update and refresh local package, ABS and AUR databases |
57-| yaupg | `yaourt -Syua` | Sync with repositories before upgrading all packages (from AUR too) |
58-| yasu | `yaourt -Syua --no-confirm` | Same as `yaupg`, but without confirmation |
59-| upgrade[²](#f2) | `yaourt -Syu` | Sync with repositories before upgrading packages |
60-
61-#### Yay[¹](#f1)
62+#### Yay
63
64 | Alias | Command | Description |
65 |---------|--------------------------------|-------------------------------------------------------------------|
66@@ -165,23 +143,19 @@ upgrades were available. Use `pacman -Que` instead.
67 | yaupd | `yay -Sy` | Update and refresh local package, ABS and AUR databases |
68 | yaupg | `yay -Syu` | Sync with repositories before upgrading packages |
69 | yasu | `yay -Syu --no-confirm` | Same as `yaupg`, but without confirmation |
70-| upgrade[²](#f2) | `yay -Syu` | Sync with repositories before upgrading packages |
71+| upgrade[¹](#f1) | `yay -Syu` | Sync with repositories before upgrading packages |
72
73 ---
74
75 <span id="f1">¹</span>
76-Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
77-
78-<span id="f2">²</span>
79 The `upgrade` alias is set for all package managers. Its value will depend on
80 whether the package manager is installed, checked in the following order:
81
82 1. `yay`
83-2. `yaourt`
84-3. `trizen`
85-4. `pacaur`
86-5. `aura`
87-6. `pacman`
88+2. `trizen`
89+3. `pacaur`
90+4. `aura`
91+5. `pacman`
92
93 ## Contributors
94
95diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
96index c94fb8f6c7865c305af052eda328afed16c2c4fa..0c5782d98533f9f256bff0a10b4f85d46b6fab06 100644
97--- a/plugins/archlinux/archlinux.plugin.zsh
98+++ b/plugins/archlinux/archlinux.plugin.zsh
99@@ -104,7 +104,7 @@ if (( $+commands[aura] )); then
100 alias auras='aura -As --both'
101 alias auupd="sudo aura -Sy"
102 alias auupg='sudo sh -c "aura -Syu && aura -Au"'
103- alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
104+ alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
105 alias upgrade='sudo aura -Syu'
106
107 # extra bonus specially for aura
108@@ -153,26 +153,6 @@ if (( $+commands[trizen] )); then
109 alias upgrade='trizen -Syu'
110 fi
111
112-if (( $+commands[yaourt] )); then
113- alias yaconf='yaourt -C'
114- alias yaupg='yaourt -Syua'
115- alias yasu='yaourt -Syua --noconfirm'
116- alias yain='yaourt -S'
117- alias yains='yaourt -U'
118- alias yare='yaourt -R'
119- alias yarem='yaourt -Rns'
120- alias yarep='yaourt -Si'
121- alias yareps='yaourt -Ss'
122- alias yaloc='yaourt -Qi'
123- alias yalocs='yaourt -Qs'
124- alias yalst='yaourt -Qe'
125- alias yaorph='yaourt -Qtd'
126- alias yainsd='yaourt -S --asdeps'
127- alias yamir='yaourt -Syy'
128- alias yaupd="yaourt -Sy"
129- alias upgrade='yaourt -Syu'
130-fi
131-
132 if (( $+commands[yay] )); then
133 alias yaconf='yay -Pg'
134 alias yaupg='yay -Syu'
135@@ -192,4 +172,3 @@ if (( $+commands[yay] )); then
136 alias yaupd="yay -Sy"
137 alias upgrade='yay -Syu'
138 fi
139-