Revive package and update PKGBUILD

1 files changed, 28 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fca57681aa09..bd6c378d0248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,45 @@
-# Maintainer: John Jenkins <twodopeshaggy@gmail.com>
+# Maintainer: Carter Green <crtrgreen@gmail.com>
+# Contributor: John Jenkins <twodopeshaggy@gmail.com>
 
+_pkgname=ccat
 pkgname=ccat-git
-pkgver=r122.561b2d4
+pkgver=1.1.0.r31.g7cf6d90
 pkgrel=1
 pkgdesc="Colorizes output for cat."
 arch=('any')
 url="https://github.com/jingweno/ccat"
 license=('CUSTOM')
 makedepends=('go' 'git')
-options=('!strip' '!emptydirs')
 conflicts=('ccat' 'ccrypt')
-source=($pkgname::git+https://github.com/jingweno/ccat.git)
-md5sums=('SKIP')
+source=("${_pkgname}::git+${url}.git")
+sha256sums=('SKIP')
+
 pkgver() {
-  cd $srcdir/$pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git -C "${_pkgname}" describe --long --tags | sed "s/-/.r/;s/-/./g;s/^v//"
+}
+
+check() {
+  cd "${srcdir}/${_pkgname}"
+  ./bin/test
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-    mkdir -p "$srcdir/go"
-    export GOPATH="$srcdir/go"
-    go get github.com/mattn/go-colorable
-    go get github.com/spf13/cobra
-    go get github.com/mattn/go-isatty
-    go get github.com/sourcegraph/syntaxhighlight
-    msg2 'Building ccat'
-    ./bin/build
+  cd "${srcdir}/${_pkgname}"
+  mkdir -p "${srcdir}/go"
+  export GOPATH="${srcdir}/go"
+  msg2 "Getting dependencies..."
+  go get github.com/mattn/go-colorable
+  go get github.com/spf13/cobra
+  go get github.com/mattn/go-isatty
+  go get github.com/sourcegraph/syntaxhighlight
+  msg2 "Building..."
+  ./bin/build
 }
 
 package() {
-  mkdir -p "$pkgdir/usr/bin"
-  install -p -m755 $srcdir/$pkgname/bin/ccat "$pkgdir/usr/bin"
-  
-  cd "$srcdir/$pkgname"
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
-  install -m 0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/
-
+  cd "${srcdir}/${_pkgname}"
+  install -Dm755 "bin/${_pkgname}" "$pkgdir/usr/bin/${_pkgname}"
+  mkdir -p "$pkgdir/usr/share/licenses/${_pkgname}"
+  install -m 0644 LICENSE "$pkgdir/usr/share/licenses/${_pkgname}/"
 }
+