2fce6a0faf4e9c2c44521cd51ff8c88f11346e02

Author
Marc Cornellà <marc.cornella@live.com>
Committer
GitHub <noreply@github.com>
Date

Message

[archlinux] Fix function syntax to avoid clashes with aliases

See https://bugs.debian.org/871816

Fixes #6592

Diff

 1diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
 2index 9172aaa704a9091532c7ef653e6c6fa0256bc477..79cc6ed11f3371e0641e149f1b2611916bf82423 100644
 3--- a/plugins/archlinux/archlinux.plugin.zsh
 4+++ b/plugins/archlinux/archlinux.plugin.zsh
 5@@ -84,19 +84,19 @@ if (( $+commands[pacaur] )); then
 6 fi
 7 
 8 if (( $+commands[trizen] )); then
 9-  upgrade() {
10+  function upgrade() {
11     trizen -Syu
12   }
13 elif (( $+commands[pacaur] )); then
14-  upgrade() {
15+  function upgrade() {
16     pacaur -Syu
17   }
18 elif (( $+commands[yaourt] )); then
19-  upgrade() {
20+  function upgrade() {
21     yaourt -Syu
22   }
23 else
24-  upgrade() {
25+  function upgrade() {
26     sudo pacman -Syu
27   }
28 fi
29@@ -129,13 +129,13 @@ else
30   alias pacupd='sudo pacman -Sy'
31 fi
32 
33-paclist() {
34+function paclist() {
35   # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
36   LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
37     awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
38 }
39 
40-pacdisowned() {
41+function pacdisowned() {
42   emulate -L zsh
43 
44   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
45@@ -153,14 +153,14 @@ pacdisowned() {
46   comm -23 "$fs" "$db"
47 }
48 
49-pacmanallkeys() {
50+function pacmanallkeys() {
51   emulate -L zsh
52   curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
53     awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
54     xargs sudo pacman-key --recv-keys
55 }
56 
57-pacmansignkeys() {
58+function pacmansignkeys() {
59   emulate -L zsh
60   for key in $*; do
61     sudo pacman-key --recv-keys $key