2.0.0.b5

3 files changed, 28 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69eb9560a1b7..8b23f3d666d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openhab-beta
 	pkgdesc = openHAB2 open source home automation software
-	pkgver = 2.0.0_20160326
+	pkgver = 2.0.0.b5
 	pkgrel = 1
 	url = http://www.openhab.org/
 	arch = any
@@ -9,13 +9,12 @@ pkgbase = openhab-beta
 	depends = java-runtime-headless>=8
 	conflicts = openhab-runtime
 	conflicts = openhab-addons
-	noextract = openhab-online-2.0.0-SNAPSHOT.zip
 	backup = etc/openhab/conf/services/addons.cfg
 	backup = etc/openhab/conf/services/runtime.cfg
-	source = https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-2.0.0-SNAPSHOT.zip
+	source = https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-online%2F2.0.0.b5%2Fopenhab-online-2.0.0.b5.tar.gz
 	source = openhab.service
-	sha1sums = SKIP
-	sha1sums = 3494cf262f5b87dcff75044c8c2eee670a6f715c
+	sha256sums = 4b38c5b5e8ccf351f646203b4380d549cf922e1fc7921a1d3d506910151db2cb
+	sha256sums = 92be5e206c878bb1a1b476f62b815f24dca198e8e0055095f797d264d8521bfe
 
 pkgname = openhab-beta
 
diff --git a/.gitignore b/.gitignore
index 2b4f73cfb1ad..10f06ddcf092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.[oa]
 *.zip
+*.gz
 *.pkg.*
 pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 5200e70b95b3..720e0f5a0cc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Hillenbrand <codeworkx@bbqlinux.org>
 pkgname=openhab-beta
-_pkgver=2.0.0
-pkgver=2.0.0_20161001
+_pkgver=2.0.0.b5
+pkgver=2.0.0.b5
 pkgrel=1
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
@@ -15,40 +15,36 @@ conflicts=('openhab-runtime' 'openhab-addons')
 backup=('etc/openhab/conf/services/addons.cfg'
 		'etc/openhab/conf/services/runtime.cfg')
 
-source=("https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-${_pkgver}-SNAPSHOT.zip"
+source=("https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-online%2F${_pkgver}%2Fopenhab-online-${_pkgver}.tar.gz"
         "openhab.service")
 
-noextract=("openhab-online-${_pkgver}-SNAPSHOT.zip")
-
-sha1sums=('SKIP'
-          '3494cf262f5b87dcff75044c8c2eee670a6f715c')
-
-pkgver() {
-    printf "${_pkgver}_%s" "$(date +%Y%m%d)"
-}
-
-prepare() {
-	mkdir -p "$srcdir/openhab"
-	cd "$srcdir/openhab"
-
-	unzip "$srcdir/openhab-online-${_pkgver}-SNAPSHOT.zip"
-
-}
+sha256sums=('4b38c5b5e8ccf351f646203b4380d549cf922e1fc7921a1d3d506910151db2cb'
+            '92be5e206c878bb1a1b476f62b815f24dca198e8e0055095f797d264d8521bfe')
 
 package() {
 	cd $pkgdir
 
     mkdir -p etc/openhab
-	mkdir -p opt
+	mkdir -p opt/openhab
 	mkdir -p usr/lib/systemd/system
 
+    # copy system service file
 	cp $srcdir/openhab.service usr/lib/systemd/system
-
-	cp -r $srcdir/openhab opt/
-
-	mv opt/openhab/conf etc/openhab/conf
-	ln -s /etc/openhab/conf opt/openhab/conf
     
-    mv opt/openhab/addons etc/openhab/addons
+    # copy main openhab files
+	cp -r $srcdir/runtime opt/openhab/
+	cp -r $srcdir/userdata opt/openhab/
+	cp -r $srcdir/LICENSE.TXT opt/openhab/
+	cp -r $srcdir/start.bat opt/openhab/
+	cp -r $srcdir/start.sh opt/openhab/
+	cp -r $srcdir/start_debug.bat opt/openhab/
+	cp -r $srcdir/start_debug.sh opt/openhab/
+
+    # copy addons and conf
+    cp -r $srcdir/addons etc/openhab/addons
+	cp -r $srcdir/conf etc/openhab/conf
+
+    # create symlinks
+	ln -s /etc/openhab/conf opt/openhab/conf
 	ln -s /etc/openhab/addons opt/openhab/addons
 }