install ZSH completions, cleanup

4 files changed, 4 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e4ee9a6da52..318aad1de921 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cheat
 	pkgdesc = Allows you to create and view interactive cheatsheets on the command-line
 	pkgver = 4.4.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/cheat/cheat
 	arch = x86_64
 	arch = arm
@@ -13,17 +13,14 @@ pkgbase = cheat
 	makedepends = git
 	makedepends = go
 	makedepends = pandoc
-	optdepends = bash-completion: for bash completions
 	optdepends = fzf: Fuzzy Finder integration for bash-completion
 	conflicts = python-cheat
 	replaces = python-cheat
 	backup = etc/cheat/conf.yml
 	source = cheat-4.4.0.tar.gz::https://github.com/cheat/cheat/archive/refs/tags/4.4.0.tar.gz
-	source = chris.pgp
 	source = conf.yml
 	source = git+https://github.com/cheat/cheatsheets.git#commit=36bdb99dcfadde210503d8c2dcf94b34ee950e1d
 	sha256sums = 8694d75896dcb1dfb91ed95ec37f7fe409ad2bde76e66f80b20be24ee92ae3ec
-	sha256sums = 6318f816e4c8f2e9c34b8dc1855adeff58c1254809b8aa86c2b39ed155f3d2b6
 	sha256sums = 7eddb96f22a29b0d4dc1d953cdb047342495230ea3c0cb16f78a1d888e79fa8e
 	sha256sums = SKIP
 
diff --git a/.gitignore b/.gitignore
index 78ebebb157f5..c4daeee9d8b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!chris.pgp
 !conf.yml
diff --git a/PKGBUILD b/PKGBUILD
index 22e7313ab716..15aa2938735e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,26 @@
 # Contributor: Bogdan <d0xi at inbox dot ru>
 pkgname=cheat
 pkgver=4.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Allows you to create and view interactive cheatsheets on the command-line"
 arch=('x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/cheat/cheat"
 license=('MIT' 'CC0 1.0 Universal')
-#makedepends=('auth-tarball-from-git' 'git' 'go' 'pandoc')
 makedepends=('git' 'go' 'pandoc')
-optdepends=('bash-completion: for bash completions'
-            'fzf: Fuzzy Finder integration for bash-completion')
+optdepends=('fzf: Fuzzy Finder integration for bash-completion')
 conflicts=("python-$pkgname")
 replaces=("python-$pkgname")
 backup=("etc/$pkgname/conf.yml")
 _commit=36bdb99dcfadde210503d8c2dcf94b34ee950e1d
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-        'chris.pgp' # Christopher Allen Lane <chris@chris-allen-lane.com>
         'conf.yml'
         "git+https://github.com/cheat/cheatsheets.git#commit=$_commit")
 sha256sums=('8694d75896dcb1dfb91ed95ec37f7fe409ad2bde76e66f80b20be24ee92ae3ec'
-            '6318f816e4c8f2e9c34b8dc1855adeff58c1254809b8aa86c2b39ed155f3d2b6'
             '7eddb96f22a29b0d4dc1d953cdb047342495230ea3c0cb16f78a1d888e79fa8e'
             'SKIP')
 
 prepare() {
   cd "$pkgname-$pkgver"
-
-#  auth-tarball-from-git --keyring ../chris.pgp \
-#    --tag "$pkgver" --prefix "$pkgname-$pkgver" \
-#    https://github.com/cheat/cheat.git ../"$pkgname-$pkgver.tar.gz"
-
   export GOPATH="$srcdir/gopath"
   go mod vendor
   go mod tidy
@@ -64,9 +55,7 @@ package() {
   install -Dm644 "scripts/$pkgname.bash" \
     "$pkgdir/usr/share/bash-completion/completions/$pkgname"
   install -Dm644 "scripts/$pkgname.fish" -t "$pkgdir/usr/share/fish/completions/"
-
-  # Conflicts with zsh-suggestions, copy or symlink from the doc folder
-#  install -Dm644 "scripts/$pkgname.zsh" "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
+  install -Dm644 "scripts/$pkgname.zsh" "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
   install -Dm644 "scripts/$pkgname.zsh" "$pkgdir/usr/share/doc/$pkgname/_$pkgname"
 
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/$pkgname-LICENSE"
diff --git a/chris.pgp b/chris.pgp
deleted file mode 100644
index 0affe03b2722..000000000000
--- a/chris.pgp
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: Hostname: 
-Version: Hockeypuck 2.1.0-150-g84bfaaa
-
-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
-GBX0WhMFnQuCDNMDDnxgB4za
-=uoIR
------END PGP PUBLIC KEY BLOCK-----