Fix missing assets and config dirs

3 files changed, 21 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 968f3fa71e05..66fd3d8e6136 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Feb 12 16:39:32 UTC 2017
+# Sat Feb 25 12:25:55 UTC 2017
 pkgbase = beehive
 	pkgdesc = A flexible event and agent system with lots of bees
 	pkgver = 0.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/muesli/beehive
 	arch = x86_64
 	arch = i686
@@ -12,9 +12,11 @@ pkgbase = beehive
 	options = !strip
 	options = !emptydirs
 	source = https://github.com/muesli/beehive/archive/v0.2.tar.gz
+	source = beehive-admin-dist.zip::https://github.com/muesli/beehive-admin-dist/archive/e9e9a1124cf2d936e022be2371c6a5dd31f3a294.zip
 	source = beehive.install
 	source = beehive.service
 	sha256sums = 6d0f2587e3b9f1ff0ae75fec58a5f49c520497f8f4a16a96b1c1ad5e0e1466b5
+	sha256sums = 7a87f6960d2deab3475cf7c96646bcd83126b40abe3381aa49505b92b8036666
 	sha256sums = 3a6725b9b51de4a8697c983844d742e499828af80d137f6ddc53523294111396
 	sha256sums = 0b25ced04449720cba74c0c13bc6c0b75ff6f34bcaad58889745f572f66e7160
 
diff --git a/PKGBUILD b/PKGBUILD
index 8de4ad7f643b..4511a7c105bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,21 @@
 
 pkgname=beehive
 pkgver=0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A flexible event and agent system with lots of bees"
 arch=('x86_64' 'i686')
 url="https://github.com/muesli/beehive"
 license=('AGPL3')
 makedepends=('go')
 options=('!strip' '!emptydirs')
-source=("https://github.com/muesli/${pkgname}/archive/v${pkgver}.tar.gz" beehive.install beehive.service)
+source=("https://github.com/muesli/${pkgname}/archive/v${pkgver}.tar.gz"
+        "beehive-admin-dist.zip::https://github.com/muesli/beehive-admin-dist/archive/e9e9a1124cf2d936e022be2371c6a5dd31f3a294.zip"
+        "beehive.install"
+        "beehive.service")
 sha256sums=('6d0f2587e3b9f1ff0ae75fec58a5f49c520497f8f4a16a96b1c1ad5e0e1466b5'
+            '7a87f6960d2deab3475cf7c96646bcd83126b40abe3381aa49505b92b8036666'
             '3a6725b9b51de4a8697c983844d742e499828af80d137f6ddc53523294111396'
-            '0b25ced04449720cba74c0c13bc6c0b75ff6f34bcaad58889745f572f66e7160')
+            '8123c8f031ff32a6cf1e6986d5b96ab961a24515beedc52a02ba1c11e9b60506')
 
 prepare() {
     cd "$pkgname-$pkgver"
@@ -27,11 +31,19 @@ build() {
 package() {
     cd "$pkgname-$pkgver"
 
-    install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname"
+    # Install binary
+    install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/share/webapps/beehive/$pkgname"
+    # Copy assets dir
+    cp -r assets "$pkgdir/usr/share/webapps/beehive/assets"
+    # Copy License
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     cd ${srcdir}
+    # Copy Unit file
     install -Dm644 beehive.service "$pkgdir/usr/lib/systemd/system/beehive.service"
+
+    # Copy webinterface files
+    cp -r beehive-admin-dist-e9e9a1124cf2d936e022be2371c6a5dd31f3a294/* "$pkgdir/usr/share/webapps/beehive/config"
 }
 
 # vim:set ts=4 sw=4 et:
diff --git a/beehive.service b/beehive.service
index fb4cd015aea5..e41fd22b11a1 100644
--- a/beehive.service
+++ b/beehive.service
@@ -3,7 +3,7 @@ Description=Beehive
 
 [Service]
 User=beehive
-ExecStart=/usr/bin/beehive -config /etc/beehive/beehive.conf
+ExecStart=/usr/share/webapps/beehive/beehive -config /etc/beehive/beehive.conf
 
 [Install]
 WantedBy=multi-user.target