Adapting to the new structure

5 files changed, 39 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1d88fbe6259..b1cd99683f75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,11 @@
 pkgbase = tempreader-git
 	pkgdesc = RESTful API to read data from DS18B20 temperature sensors.
-	pkgver = r1.c5900e3
-	pkgrel = 4
-	url = https://github.com/tempreader/
-	arch = x86_64
-	arch = i686
-	arch = arm
-	arch = armv6h
-	arch = armv7h
+	pkgver = r4.ce5459d
+	pkgrel = 1
+	url = https://github.com/jtyr/tempreader
+	arch = any
 	license = MIT
 	makedepends = go
-	makedepends = git
-	options = !strip
-	options = !emptydirs
-	backup = etc/default/tempreader
-	source = https://github.com/jtyr/tempreader/archive/master.tar.gz
-	source = tempreader.service
-	source = tempreader.default
-	sha256sums = SKIP
-	sha256sums = 2b6666d49bb73f82404aa8602d6505a2d0e84e223dea3f3cb1f6e9e9c79b072c
-	sha256sums = 13d5eb78950e0739abacb2a617ced6940965161972763b11e3f2a64614a99e00
 
 pkgname = tempreader-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 0445da2c4dba..1915e272b1f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,42 @@
 # Maintainer: Jiri Tyr <jiri.tyr@gmail.com>
 
-_pkgname=tempreader
-pkgname="${_pkgname}-git"
-pkgver=r1.c5900e3
-pkgrel=4
+_pkg='tempreader'
+_gopkg="github.com/jtyr/$_pkg"
+
+pkgname="$_pkg-git"
+pkgver=r4.ce5459d
+pkgrel=1
 pkgdesc='RESTful API to read data from DS18B20 temperature sensors.'
-arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/${_pkgname}/"
+url="https://github.com/jtyr/tempreader"
+arch=('any')
 license=('MIT')
-makedepends=('go' 'git')
-backup=("etc/default/${_pkgname}")
-options=('!strip' '!emptydirs')
-source=(
-  "https://github.com/jtyr/${_pkgname}/archive/master.tar.gz"
-  "${_pkgname}.service"
-  "${_pkgname}.default")
-sha256sums=(
-  'SKIP'
-  '2b6666d49bb73f82404aa8602d6505a2d0e84e223dea3f3cb1f6e9e9c79b072c'
-  '13d5eb78950e0739abacb2a617ced6940965161972763b11e3f2a64614a99e00')
+makedepends=('go')
 
-build() {
-  cd "${_pkgname}-master/${_pkgname}"
 
-  GOPATH="$srcdir" go get github.com/gorilla/mux
-  GOPATH="$srcdir" go build
+pkgver() {
+    msg2 'Getting version'
+    cd "$srcdir/src/$_gopkg"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package() {
-  cd "${_pkgname}-master"
 
-  install -Dm755 "${_pkgname}/${_pkgname}" "$pkgdir/usr/bin/${_pkgname}"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
-  install -Dm644 "$startdir/${_pkgname}.service" "$pkgdir/usr/lib/systemd/system/${_pkgname}.service"
-  install -Dm644 "$startdir/${_pkgname}.default" "$pkgdir/etc/default/${_pkgname}"
+prepare() {
+    msg2 'Fetching Go package'
+    GOPATH="$srcdir" go get -u "$_gopkg"
+}
+
+
+build() {
+    msg2 'Building binary'
+    rm -f "$srcdir/bin/$_pkg"
+    GOPATH="$srcdir" go install "$_gopkg"
 }
 
-# vim:set ts=2 sw=2 et:
+
+package() {
+    msg2 'Installing files'
+    install -Dm755 "$srcdir/bin/$_pkg" -t "$pkgdir/usr/bin"
+    install -Dm644 "$srcdir/src/$_gopkg/"/{LICENSE,README.md} -t "$pkgdir/usr/doc/$_pkg"
+    install -Dm644 "$srcdir/src/$_gopkg/contrib/$_pkg.service" "$pkgdir/usr/lib/systemd/system/$_pkg.service"
+    install -Dm644 "$srcdir/src/$_gopkg/contrib/$_pkg.default" "$pkgdir/etc/default/$_pkg"
+}
diff --git a/tempreader.default b/tempreader.default
deleted file mode 100644
index ebda39884142..000000000000
--- a/tempreader.default
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPREADER_ROOT=/sys/bus/w1/devices
-TEMPREADER_DEBUG=false
-TEMPREADER_ADDR=0.0.0.0:8000
diff --git a/tempreader.service b/tempreader.service
deleted file mode 100644
index 3cd735193e3c..000000000000
--- a/tempreader.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=RESTful API to read data from DS18B20 temperature sensors.
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/default/tempreader
-ExecStart=/usr/bin/tempreader
-
-[Install]
-WantedBy=default.target