2 files changed, 29 insertions, 12 deletions

diff --git a/ouch-bin/.SRCINFO b/ouch-bin/.SRCINFO
index 6247c1d..395e550 100644
--- a/ouch-bin/.SRCINFO
+++ b/ouch-bin/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ouch-bin
         pkgdesc = Painless compression and decompression in the terminal (binary release)
-        pkgver = 0.3.1
+        pkgver = 0.4.0
         pkgrel = 1
         url = https://github.com/ouch-org/ouch
         arch = x86_64
@@ -8,9 +8,7 @@ pkgbase = ouch-bin
         provides = ouch
         conflicts = ouch
         conflicts = ouch-git
-        source = ouch::https://github.com/ouch-org/ouch/releases/download/0.3.1/ouch-x86_64-linux-musl
-        source = LICENSE::https://raw.githubusercontent.com/ouch-org/ouch/master/LICENSE
-        sha256sums = 48843b18aee48273e60456267c408163d51df046ad79a6cdd99c75c45cb79afe
-        sha256sums = f082ccc8a66b3fdbeb6d53d5fe084934fc6f480a9d1d9243d2c5d9e45ec76938
+        source = ouch-0.4.0.tar.gz::https://github.com/ouch-org/ouch/releases/download/0.4.0/ouch-x86_64-unknown-linux-gnu.tar.gz
+        sha256sums = 4b03c6a54b12e2038600cfb450aebac70bd9516fc9bf50a78c93f93fef75e60b
 
 pkgname = ouch-bin
diff --git a/ouch-bin/PKGBUILD b/ouch-bin/PKGBUILD
index 9bc3dfd..0641836 100644
--- a/ouch-bin/PKGBUILD
+++ b/ouch-bin/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ouch-bin
 _pkgname=${pkgname%-bin}
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Painless compression and decompression in the terminal (binary release)"
 arch=('x86_64')
@@ -10,12 +10,31 @@ url="https://github.com/ouch-org/ouch"
 license=('MIT')
 provides=(${_pkgname})
 conflicts=(${_pkgname} ${_pkgname}-git)
-source=("${_pkgname}::${url}/releases/download/${pkgver}/ouch-x86_64-linux-musl"
-  "LICENSE::https://raw.githubusercontent.com/ouch-org/ouch/master/LICENSE")
-sha256sums=('48843b18aee48273e60456267c408163d51df046ad79a6cdd99c75c45cb79afe'
-  'f082ccc8a66b3fdbeb6d53d5fe084934fc6f480a9d1d9243d2c5d9e45ec76938')
+source=("${_pkgname}-${pkgver}.tar.gz::${url}/releases/download/${pkgver}/ouch-x86_64-unknown-linux-gnu.tar.gz")
+sha256sums=('4b03c6a54b12e2038600cfb450aebac70bd9516fc9bf50a78c93f93fef75e60b')
 
 package() {
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${_pkgname}/LICENSE"
-  install -Dvm755 "${_pkgname}" -t "${pkgdir}/usr/bin"
+  # Binary releaes is archived in a folder with a generic name, it is not ideal
+  # (e.g. aur helpers will complain about name clashes)
+  # So we fix it
+  cd "${srcdir}"
+  mkdir "${_pkgname}-${pkgver}"
+  mv "${srcdir}/ouch-x86_64-unknown-linux-gnu/"* "${_pkgname}-${pkgver}"
+  rmdir ouch-x86_64-unknown-linux-gnu
+
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  install -Dm0755 -t "${pkgdir}/usr/bin" "${_pkgname}"
+  install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/${_pkgname}/LICENSE"
+
+  # install manpages
+  install -Dm0644 "man/${_pkgname}.1" -t "${pkgdir}/usr/share/man/man1"
+  install -Dm0644 "man/${_pkgname}-compress.1" -t "${pkgdir}/usr/share/man/man1"
+  install -Dm0644 "man/${_pkgname}-decompress.1" -t "${pkgdir}/usr/share/man/man1"
+  install -Dm0644 "man/${_pkgname}-list.1" -t "${pkgdir}/usr/share/man/man1"
+
+  # install shell completions
+  install -Dm0644 "completions/${_pkgname}.bash" "${pkgdir}/usr/share/bash-completion/completions/${_pkgname}"
+  install -Dm0644 "completions/${_pkgname}.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/${_pkgname}.fish"
+  install -Dm0644 "completions/_${_pkgname}" "${pkgdir}/usr/share/zsh/site-functions/_${_pkgname}"
 }