790f185e0fd8b70eab33847afe02af07f6af3a1e
- Author
- ratijas <me@ratijas.tk>
- Committer
- GitHub <noreply@github.com>
- Date
Message
refactor(archlinux): fix name & scripts; reorder aliases (#9546) Co-authored-by: Marc Cornellà <hello@mcornella.com>
Diff
This diff is truncated to protect this page.
1diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
2index 5882c7603594ef16f1a8db8fb442bf4a8bf86e3b..a4f191a5ffe18ceb68592503bc93cf16eee1ec4d 100644
3--- a/plugins/archlinux/README.md
4+++ b/plugins/archlinux/README.md
5@@ -1,4 +1,4 @@
6-# Archlinux plugin
7+# Arch Linux plugin
8
9 This plugin adds some aliases and functions to work with Arch Linux.
10
11@@ -10,145 +10,159 @@ plugins=(... archlinux)
12
13 ## Features
14
15-#### YAY
16-
17-| Alias | Command | Description |
18-|---------|------------------------------------|---------------------------------------------------------------------|
19-| yaconf | yay -Pg | Print current configuration |
20-| yain | yay -S | Install packages from the repositories |
21-| yains | yay -U | Install a package from a local file |
22-| yainsd | yay -S --asdeps | Install packages as dependencies of another package |
23-| yaloc | yay -Qi | Display information about a package in the local database |
24-| yalocs | yay -Qs | Search for packages in the local database |
25-| yalst | yay -Qe | List installed packages including from AUR (tagged as "local") |
26-| yamir | yay -Syy | Force refresh of all package lists after updating mirrorlist |
27-| yaorph | yay -Qtd | Remove orphans using yay |
28-| yare | yay -R | Remove packages, keeping its settings and dependencies |
29-| yarem | yay -Rns | Remove packages, including its settings and unneeded dependencies |
30-| yarep | yay -Si | Display information about a package in the repositories |
31-| yareps | yay -Ss | Search for packages in the repositories |
32-| yaupg | yay -Syu | Sync with repositories before upgrading packages |
33-| yasu | yay -Syu --no-confirm | Same as `yaupg`, but without confirmation |
34-
35-#### TRIZEN
36-
37-| Alias | Command | Description |
38-|---------|------------------------------------|---------------------------------------------------------------------|
39-| trconf | trizen -C | Fix all configuration files with vimdiff |
40-| trin | trizen -S | Install packages from the repositories |
41-| trins | trizen -U | Install a package from a local file |
42-| trinsd | trizen -S --asdeps | Install packages as dependencies of another package |
43-| trloc | trizen -Qi | Display information about a package in the local database |
44-| trlocs | trizen -Qs | Search for packages in the local database |
45-| trlst | trizen -Qe | List installed packages including from AUR (tagged as "local") |
46-| trmir | trizen -Syy | Force refresh of all package lists after updating mirrorlist |
47-| trorph | trizen -Qtd | Remove orphans using yaourt |
48-| trre | trizen -R | Remove packages, keeping its settings and dependencies |
49-| trrem | trizen -Rns | Remove packages, including its settings and unneeded dependencies |
50-| trrep | trizen -Si | Display information about a package in the repositories |
51-| trreps | trizen -Ss | Search for packages in the repositories |
52-| trupd | trizen -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases |
53-| trupd | trizen -Sy && sudo abs | Update and refresh the local package and ABS databases |
54-| trupd | trizen -Sy && sudo aur | Update and refresh the local package and AUR databases |
55-| trupd | trizen -Sy | Update and refresh the local package database |
56-| trupg | trizen -Syua | Sync with repositories before upgrading all packages (from AUR too) |
57-| trsu | trizen -Syua --no-confirm | Same as `trupg`, but without confirmation |
58-| upgrade | trizen -Syu | Sync with repositories before upgrading packages |
59-
60-#### YAOURT
61-
62-| Alias | Command | Description |
63-|---------|------------------------------------|---------------------------------------------------------------------|
64-| yaconf | yaourt -C | Fix all configuration files with vimdiff |
65-| yain | yaourt -S | Install packages from the repositories |
66-| yains | yaourt -U | Install a package from a local file |
67-| yainsd | yaourt -S --asdeps | Install packages as dependencies of another package |
68-| yaloc | yaourt -Qi | Display information about a package in the local database |
69-| yalocs | yaourt -Qs | Search for packages in the local database |
70-| yalst | yaourt -Qe | List installed packages including from AUR (tagged as "local") |
71-| yamir | yaourt -Syy | Force refresh of all package lists after updating mirrorlist |
72-| yaorph | yaourt -Qtd | Remove orphans using yaourt |
73-| yare | yaourt -R | Remove packages, keeping its settings and dependencies |
74-| yarem | yaourt -Rns | Remove packages, including its settings and unneeded dependencies |
75-| yarep | yaourt -Si | Display information about a package in the repositories |
76-| yareps | yaourt -Ss | Search for packages in the repositories |
77-| yaupd | yaourt -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases |
78-| yaupd | yaourt -Sy && sudo abs | Update and refresh the local package and ABS databases |
79-| yaupd | yaourt -Sy && sudo aur | Update and refresh the local package and AUR databases |
80-| yaupd | yaourt -Sy | Update and refresh the local package database |
81-| yaupg | yaourt -Syua | Sync with repositories before upgrading all packages (from AUR too) |
82-| yasu | yaourt -Syua --no-confirm | Same as `yaupg`, but without confirmation |
83-| upgrade | yaourt -Syu | Sync with repositories before upgrading packages |
84-
85-#### PACAUR
86-
87-| Alias | Command | Description |
88-|---------|------------------------------------|---------------------------------------------------------------------|
89-| pain | pacaur -S | Install packages from the repositories |
90-| pains | pacaur -U | Install a package from a local file |
91-| painsd | pacaur -S --asdeps | Install packages as dependencies of another package |
92-| paloc | pacaur -Qi | Display information about a package in the local database |
93-| palocs | pacaur -Qs | Search for packages in the local database |
94-| palst | pacaur -Qe | List installed packages including from AUR (tagged as "local") |
95-| pamir | pacaur -Syy | Force refresh of all package lists after updating mirrorlist |
96-| paorph | pacaur -Qtd | Remove orphans using pacaur |
97-| pare | pacaur -R | Remove packages, keeping its settings and dependencies |
98-| parem | pacaur -Rns | Remove packages, including its settings and unneeded dependencies |
99-| parep | pacaur -Si | Display information about a package in the repositories |
100-| pareps | pacaur -Ss | Search for packages in the repositories |
101-| paupd | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases |
102-| paupd | pacaur -Sy && sudo abs | Update and refresh the local package and ABS databases |
103-| paupd | pacaur -Sy && sudo aur | Update and refresh the local package and AUR databases |
104-| paupd | pacaur -Sy | Update and refresh the local package database |
105diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
106index 32f09cef906a6dad550d8fa7343702eab2ea97eb..d537610771e202a5337cdddc6826034c90ba9b35 100644
107--- a/plugins/archlinux/archlinux.plugin.zsh
108+++ b/plugins/archlinux/archlinux.plugin.zsh
109@@ -1,138 +1,12 @@
110-if (( $+commands[trizen] )); then
111- alias trconf='trizen -C'
112- alias trupg='trizen -Syua'
113- alias trsu='trizen -Syua --noconfirm'
114- alias trin='trizen -S'
115- alias trins='trizen -U'
116- alias trre='trizen -R'
117- alias trrem='trizen -Rns'
118- alias trrep='trizen -Si'
119- alias trreps='trizen -Ss'
120- alias trloc='trizen -Qi'
121- alias trlocs='trizen -Qs'
122- alias trlst='trizen -Qe'
123- alias trorph='trizen -Qtd'
124- alias trinsd='trizen -S --asdeps'
125- alias trmir='trizen -Syy'
126+#######################################
127+# Pacman #
128+#######################################
129
130+# abs and aur command check
131+local abs_aur=''
132+(( ! $+commands[abs] )) || abs_aur+=' && sudo abs'
133+(( ! $+commands[aur] )) || abs_aur+=' && sudo aur'
134
135- if (( $+commands[abs] && $+commands[aur] )); then
136- alias trupd='trizen -Sy && sudo abs && sudo aur'
137- elif (( $+commands[abs] )); then
138- alias trupd='trizen -Sy && sudo abs'
139- elif (( $+commands[aur] )); then
140- alias trupd='trizen -Sy && sudo aur'
141- else
142- alias trupd='trizen -Sy'
143- fi
144-fi
145-
146-if (( $+commands[yaourt] )); then
147- alias yaconf='yaourt -C'
148- alias yaupg='yaourt -Syua'
149- alias yasu='yaourt -Syua --noconfirm'
150- alias yain='yaourt -S'
151- alias yains='yaourt -U'
152- alias yare='yaourt -R'
153- alias yarem='yaourt -Rns'
154- alias yarep='yaourt -Si'
155- alias yareps='yaourt -Ss'
156- alias yaloc='yaourt -Qi'
157- alias yalocs='yaourt -Qs'
158- alias yalst='yaourt -Qe'
159- alias yaorph='yaourt -Qtd'
160- alias yainsd='yaourt -S --asdeps'
161- alias yamir='yaourt -Syy'
162-
163-
164- if (( $+commands[abs] && $+commands[aur] )); then
165- alias yaupd='yaourt -Sy && sudo abs && sudo aur'
166- elif (( $+commands[abs] )); then
167- alias yaupd='yaourt -Sy && sudo abs'
168- elif (( $+commands[aur] )); then
169- alias yaupd='yaourt -Sy && sudo aur'
170- else
171- alias yaupd='yaourt -Sy'
172- fi
173-fi
174-
175-if (( $+commands[yay] )); then
176- alias yaconf='yay -Pg'
177- alias yaupg='yay -Syu'
178- alias yasu='yay -Syu --noconfirm'
179- alias yain='yay -S'
180- alias yains='yay -U'
181- alias yare='yay -R'
182- alias yarem='yay -Rns'
183- alias yarep='yay -Si'
184- alias yareps='yay -Ss'
185- alias yaloc='yay -Qi'
186- alias yalocs='yay -Qs'
187- alias yalst='yay -Qe'
188- alias yaorph='yay -Qtd'
189- alias yainsd='yay -S --asdeps'
190- alias yamir='yay -Syy'
191-
192-
193- if (( $+commands[abs] && $+commands[aur] )); then
194- alias yaupd='yay -Sy && sudo abs && sudo aur'
195- elif (( $+commands[abs] )); then
196- alias yaupd='yay -Sy && sudo abs'
197- elif (( $+commands[aur] )); then
198- alias yaupd='yay -Sy && sudo aur'
199- else
200- alias yaupd='yay -Sy'
201- fi
202-fi
203-
204-if (( $+commands[pacaur] )); then
205- alias paupg='pacaur -Syu'
206- alias pasu='pacaur -Syu --noconfirm'
207- alias pain='pacaur -S'
208- alias pains='pacaur -U'