Version bump

2 files changed, 22 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e986fd45008..a966630af11c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dive-git
 	pkgdesc = A tool for exploring each layer in a docker image
-	pkgver = v0.6.0.r0.g54979ae
+	pkgver = v0.6.0.r4.g91d3721
 	pkgrel = 1
 	url = https://github.com/wagoodman/dive
 	arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = dive-git
 	provides = dive-bin
 	conflicts = dive
 	conflicts = dive-bin
-	source = dive::git+https://github.com/wagoodman/dive.git
+	source = dive-git::git+https://github.com/wagoodman/dive
 	sha256sums = SKIP
 
 pkgname = dive-git
diff --git a/PKGBUILD b/PKGBUILD
index 6f21c58eab77..e14fc36e2bd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Tony Lambiris <tony@criticalstack.com>
 
 pkgname=dive-git
-pkgver=v0.6.0.r0.g54979ae
-_pkgname=dive
+pkgver=v0.6.0.r4.g91d3721
 pkgrel=1
 pkgdesc="A tool for exploring each layer in a docker image"
 url="https://github.com/wagoodman/dive"
@@ -11,31 +10,42 @@ license=('MIT')
 conflicts=(dive dive-bin)
 provides=(dive dive-bin)
 makedepends=('go')
-source=("${_pkgname}::git+https://github.com/wagoodman/dive.git")
+source=("${pkgname}::git+${url}")
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
+	cd "${srcdir}/${pkgname}"
 
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "${srcdir}"
+	cd "${srcdir}/${pkgname}"
 
-	GOROOT="/usr/lib/go" GOPATH="${srcdir}/go" PATH="$PATH:$GOPATH/bin" \
-		go get -v -u github.com/wagoodman/dive
+	install -m755 -d "${srcdir}/go/src/github.com/wagoodman/"
+	cp -a "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/wagoodman/dive"
+
+	cd "${srcdir}/go/src/github.com/wagoodman/dive"
+
+	export GOROOT="/usr/lib/go" GOPATH="${srcdir}/go"
+	go get -v -d
 }
 
 build() {
 	cd "${srcdir}/go/src/github.com/wagoodman/dive"
 
-	GOROOT="/usr/lib/go" GOPATH="${srcdir}/go" PATH="$PATH:$GOPATH/bin" \
-		go build github.com/wagoodman/dive
+	mkdir -p build
+
+	export GOROOT="/usr/lib/go" GOPATH="${srcdir}/go"
+	go build -ldflags "-s -w" \
+		-gcflags="all=-trimpath=${GOPATH}/src" \
+		-asmflags="all=-trimpath=${GOPATH}/src" \
+		-o build/dive
 }
 
 package() {
 	cd "${srcdir}/go/src/github.com/wagoodman/dive"
 
-	install -Dm755 "dive" "${pkgdir}/usr/bin/dive"
+	install -Dm755 "./build/dive" "${pkgdir}/usr/bin/dive"
+	install -Dm644 "./LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }