hsync: Use simple and unified Go PKGBUILD

2 files changed, 17 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f818ae510e7f..1777e3f5ea17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jun  4 12:04:34 UTC 2016
+# Tue Jun  7 19:21:37 UTC 2016
 pkgbase = hsync
 	pkgdesc = A filesystem hierarchy synchronizer
 	pkgver = 1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ambrevar.bitbucket.org/hsync/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 208aab831099..cd7952287f9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=hsync
 pkgname=$_pkgname
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A filesystem hierarchy synchronizer"
 arch=("i686" "x86_64")
 url="http://ambrevar.bitbucket.org/$_pkgname/"
@@ -11,26 +11,31 @@ license=("MIT")
 makedepends=("go")
 source=("$pkgname-$pkgver.tar.bz2::https://bitbucket.org/ambrevar/$_pkgname/get/v$pkgver.tar.bz2")
 sha1sums=("6c6c12b3364ebb0924cd2cc56844aa58bc3970c5")
+_gourl="bitbucket.org/ambrevar/$_pkgname"
 
-build() {
-	export GOPATH="$srcdir"
-	cd "$srcdir/ambrevar-$_pkgname-2c7344b758a9"
+prepare() {
+	## Move source extracted folder to its proper location in the GOPATH.
+	cd "$srcdir"
+	rm -rfv "src/$_gourl"
+	mkdir -p "src/bitbucket.org/ambrevar"
+	mv "ambrevar-$_pkgname-2c7344b758a9" "src/$_gourl"
+}
 
+build() {
 	case "$CARCH" in
 	x86_64) GOARCH=amd64 ;;
 	i686) GOARCH=386 ;;
 	esac
 
-	go build -ldflags "-X main.version=$(git describe --tags --always)" -o $_pkgname
+	GOPATH="$srcdir" go get -v -x -ldflags "-X main.version=$pkgver" "$_gourl"
 }
 
 check() {
-	cd "$srcdir/ambrevar-$_pkgname-2c7344b758a9"
-	go test
+	GOPATH="$srcdir" go test -v -x "$_gourl"
 }
 
 package() {
-	cd "$srcdir/ambrevar-$_pkgname-2c7344b758a9"
-	install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+	cd "$srcdir"
+	install -Dm755 "bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+	install -Dm644 "src/$_gourl/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 }