Update repoctl to version 0.21

2 files changed, 27 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae5c6e5f0bb5..3f67a98670f4 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = repoctl
-	pkgdesc = A supplement to repo-add and repo-remove which simplifies managing local repositories
-	pkgver = 0.20
+	pkgdesc = An AUR helper that also simplifies managing local Pacman repositories
+	pkgver = 0.21
 	pkgrel = 1
 	url = https://github.com/cassava/repoctl
 	arch = i686
 	arch = x86_64
 	arch = armv7h
+	arch = aarch64
 	license = MIT
 	makedepends = go
 	makedepends = xz
 	depends = pacman
 	options = !strip
-	source = https://github.com/cassava/repoctl/releases/download/v0.20/repoctl-0.20.tar.gz
-	md5sums = 148065ed4e2642ffed29af1504eba761
+	source = https://github.com/cassava/repoctl/releases/download/v0.21/repoctl-0.21.tar.gz
+	md5sums = 99e172a3734a0269435710adaf449f3e
 
 pkgname = repoctl
 
diff --git a/PKGBUILD b/PKGBUILD
index 9768abd74bbd..6c9d49cb607e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,43 @@
-# Maintainer: Ben Morgan <neembi@gmail.com>
+# Maintainer: Ben Morgan <cassava@iexu.de>
 # vim: set ts=2 sw=2:
 pkgname=repoctl
-pkgver=0.20
+pkgver=0.21
 pkgrel=1
-pkgdesc="A supplement to repo-add and repo-remove which simplifies managing local repositories"
-arch=('i686' 'x86_64' 'armv7h')
+pkgdesc="An AUR helper that also simplifies managing local Pacman repositories"
+arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/cassava/repoctl"
 license=('MIT')
 depends=('pacman')
 makedepends=('go' 'xz')
 options=('!strip')
 source=(https://github.com/cassava/repoctl/releases/download/v${pkgver}/repoctl-${pkgver}.tar.gz)
-md5sums=('148065ed4e2642ffed29af1504eba761')
-
-prepare() {
-  dest="$srcdir/src/github.com/cassava"
-  mkdir -p "$dest"
-  mv "$srcdir/$pkgname-$pkgver" "$dest/repoctl"
-  cd "$srcdir"
-  ln -s "$dest/repoctl" "$pkgname-$pkgver"
-}
+md5sums=('99e172a3734a0269435710adaf449f3e')
 
 build() {
-  src="$srcdir/src/github.com/cassava/repoctl"
-  cd "$src/cmd/repoctl"
-  GOPATH="$srcdir" go build
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Build repoctl binary
+  go build -o repoctl
+
+  # Generate the completion files
+  ./repoctl completion zsh > completion.zsh
+  ./repoctl completion bash > completion.bash
+  ./repoctl completion fish > completion.fish
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Install repoctl program
-  install -d "$pkgdir/usr/bin"
-  install -m755 cmd/repoctl/repoctl "$pkgdir/usr/bin/"
+  install -Dm755 repoctl "${pkgdir}/usr/bin/repoctl"
 
-  # Install other documentation
-  install -d "$pkgdir/usr/share/doc/repoctl"
-  install -m644 README.md NEWS.md "$pkgdir/usr/share/doc/repoctl/"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/repoctl/LICENSE"
+  # Install documentation files
+  install -d "${pkgdir}/usr/share/doc/repoctl"
+  install -m644 README.md NEWS.md "${pkgdir}/usr/share/doc/repoctl/"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/repoctl/LICENSE"
 
   # Install completion files
-  install -Dm644 contrib/repoctl_completion.zsh "$pkgdir/usr/share/zsh/site-functions/_repoctl"
-  install -Dm644 contrib/repoctl_completion.bash "$pkgdir/usr/share/bash-completion/completions/repoctl"
+  install -Dm644 completion.zsh "${pkgdir}/usr/share/zsh/site-functions/_repoctl"
+  install -Dm644 completion.bash "${pkgdir}/usr/share/bash-completion/completions/repoctl"
+  install -Dm644 completion.fish "${pkgdir}/usr/share/fish/vendor_completions.d/repoctl.fish"
 }