WIP

1 files changed, 16 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 125b2a8e52c3..6acdb280dfff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,10 @@
-# Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: Stéphane Graber <stgraber AT ubuntu DOT com>
+# Maintainer: graysky <graysky AT archlinux DOT us>
 # Maintainer: edacval <edacval AT gmail DOT com
 
+# append "_cached=y" to makepkg params for use cached source files from your GOPATH
+[[ $_cached ]] && [[ $GOPATH ]] && export _oldgo="${_oldgo:-${GOPATH}:}"
+
 _pkgname=distrobuilder
 _url=github.com/lxc/$_pkgname
 pkgname=$_pkgname-git
@@ -19,36 +22,27 @@ source=($_pkgname::git://$_url.git)
 sha256sums=('SKIP')
 
 pkgver() {
-  export GOPATH="${srcdir}"/gosrc
-
-  cd "${GOPATH}"/src/$_url
+  cd $_pkgname
   echo "$(git rev-list --count HEAD).$(git describe --always)"
 }
 
 prepare() {
-  export GOPATH="${srcdir}"/gosrc
-  export GOCACHE=/tmp/makepkg/$pkgname/gocache
-
-  rm -rf "${GOPATH}"/src/$_url
-  install -d $(dirname "${GOPATH}"/src/$_url)
-  mv -v "$srcdir"/$_pkgname "${GOPATH}"/src/$_url
-  cd "${GOPATH}"/src/$_url
-  gofmt -s -w .
-  go get -v -d ./...
+  rm -rf "${srcdir}"/gosrc/src/$_url
+  install -d "$(dirname "${srcdir}"/gosrc/src/$_url)"
+  git clone -s "$srcdir"/$_pkgname "${srcdir}"/gosrc/src/$_url
+  cd "${srcdir}"/gosrc/src/$_url
+  gofmt -s -w -l .
+  GOPATH="${_oldgo:-}${srcdir}"/gosrc go get -v -d ./...
 }
 
 build() {
-  export GOPATH="${srcdir}"/gosrc
-  export GOCACHE=/tmp/makepkg/$pkgname/gocache
-
-  cd "${GOPATH}"/src/$_url/$_pkgname
-  go build -v -trimpath -ldflags '-s -w' -o $_pkgname .
+  cd "${srcdir}"/gosrc/src/$_url/$_pkgname
+  GOCACHE=/tmp/makepkg/$pkgname/gocache
+  GOPATH="${_oldgo:-}${srcdir}"/gosrc go build -v -trimpath -ldflags '-s -w' -o $_pkgname .
 }
 
 package() {
-  export GOPATH="${srcdir}"/gosrc
-
-  install -v -Dm755 "$GOPATH"/src/$_url/$_pkgname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
+  install -v -Dm755 "${srcdir}"/gosrc/src/$_url/$_pkgname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
   install -v -d "$pkgdir"/var/cache/$_pkgname
-  install -v -Dm644 -t "$pkgdir"/usr/share/$_pkgname "$GOPATH"/src/$_url/doc/examples/*
+  install -v -Dm644 -t "$pkgdir"/usr/share/$_pkgname "${srcdir}"/gosrc/src/$_url/doc/examples/*
 }