snapshot

2 files changed, 30 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce0af724c05b..62e7493e69ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openhab-beta
 	pkgdesc = openHAB2 open source home automation software
-	pkgver = 2.0.0.b5
-	pkgrel = 2
+	pkgver = 2.0.0_20161225
+	pkgrel = 1
 	url = http://www.openhab.org/
 	arch = any
 	license = EPL
@@ -9,11 +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://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-offline%2F2.0.0.b5%2Fopenhab-offline-2.0.0.b5.tar.gz
+	source = https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-2.0.0-SNAPSHOT.zip
 	source = openhab.service
-	sha256sums = 8eadd4f815c608771a6b74ad5d49eae1ec4e18ef8dd5d32c130ba4d8f0766187
+	sha256sums = SKIP
 	sha256sums = 92be5e206c878bb1a1b476f62b815f24dca198e8e0055095f797d264d8521bfe
 
 pkgname = openhab-beta
diff --git a/PKGBUILD b/PKGBUILD
index 35d3e24646a3..b398f5e86c3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Hillenbrand <codeworkx@bbqlinux.org>
 pkgname=openhab-beta
-_pkgver=2.0.0.b5
-pkgver=2.0.0.b5
-pkgrel=2
+_pkgver=2.0.0
+pkgver=2.0.0_20161225
+pkgrel=1
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
 url="http://www.openhab.org/"
@@ -15,36 +15,39 @@ conflicts=('openhab-runtime' 'openhab-addons')
 backup=('etc/openhab/conf/services/addons.cfg'
 		'etc/openhab/conf/services/runtime.cfg')
 
-source=("https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-offline%2F${_pkgver}%2Fopenhab-offline-${_pkgver}.tar.gz"
+source=("https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-${_pkgver}-SNAPSHOT.zip"
         "openhab.service")
 
-sha256sums=('8eadd4f815c608771a6b74ad5d49eae1ec4e18ef8dd5d32c130ba4d8f0766187'
+noextract=("openhab-online-${_pkgver}-SNAPSHOT.zip")
+
+sha256sums=('SKIP'
             '92be5e206c878bb1a1b476f62b815f24dca198e8e0055095f797d264d8521bfe')
 
+pkgver() {
+    printf "${_pkgver}_%s" "$(date +%Y%m%d)"
+}
+
+prepare() {
+	mkdir -p "$srcdir/openhab"
+	cd "$srcdir/openhab"
+
+	unzip "$srcdir/openhab-online-${_pkgver}-SNAPSHOT.zip"
+}
+
 package() {
 	cd $pkgdir
 
     mkdir -p etc/openhab
-	mkdir -p opt/openhab
+	mkdir -p opt
 	mkdir -p usr/lib/systemd/system
 
-    # copy system service file
 	cp $srcdir/openhab.service usr/lib/systemd/system
-    
-    # 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
+
+	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
 	ln -s /etc/openhab/addons opt/openhab/addons
 }