Merge pull request #1 from thingsplex/develop

Develop

Makefile

@@ -1,19 +1,21 @@
-version="0.10.6"
+version="0.3.4"
 version_file=VERSION
 working_dir=$(shell pwd)
 arch="armhf"
+remote_host = "fh@cube.local"
+reprepo_host = ""
 
 clean:
-	-rm tpflow
+	-rm ./package/buid/conbee
 
 build-go:
-	go build -o conbee-ad src/service.go
+	go build -o conbee src/service.go
 
 build-go-arm:
-	GOOS=linux GOARCH=arm GOARM=6 go build -o conbee-ad src/service.go
+	cd ./src;GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w" -o ../package/build/conbee service.go;cd ../
 
 build-go-amd:
-	GOOS=linux GOARCH=amd64 go build -o conbee-ad src/service.go
+	cd ./src;GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o conbee service.go;cd ../
 
 
 configure-arm:
@@ -24,36 +26,38 @@ configure-amd64:
 
 
 package-tar:
-	tar cvzf conbee-ad_$(version).tar.gz conbee-ad VERSION
+	tar cvzf conbee_$(version).tar.gz conbee VERSION
 
-package-deb-doc-1:
+package-deb-doc:
 	@echo "Packaging application as debian package"
-	chmod a+x package/debian1/DEBIAN/*
-	cp conbee-ad package/debian1/opt/thingsplex/conbee-ad
-	cp VERSION package/debian1/opt/thingsplex/conbee-ad
+	chmod a+x package/debian/DEBIAN/*
+	cp ./package/build/conbee package/debian/opt/thingsplex/conbee
+	cp VERSION package/debian/opt/thingsplex/conbee
 	docker run --rm -v ${working_dir}:/build -w /build --name debuild debian dpkg-deb --build package/debian
 	@echo "Done"
 
-package-deb-doc-2:
-	@echo "Packaging application as debian package"
-	chmod a+x package/debian2/DEBIAN/*
-	cp conbee-ad package/debian2/usr/bin/conbee-ad
-	cp VERSION package/debian2/opt/thingsplex/conbee-ad
-	docker run --rm -v ${working_dir}:/build -w /build --name debuild debian dpkg-deb --build package/debian
-	@echo "Done"
+tar-arm: build-js build-go-arm package-deb-doc
+	@echo "The application was packaged into tar archive "
 
+deb-arm : clean configure-arm build-go-arm package-deb-doc
+	mv package/debian.deb package/build/conbee_$(version)_armhf.deb
 
-tar-arm: build-js build-go-arm package-deb-doc-1
-	@echo "The application was packaged into tar archive "
+deb-amd : configure-amd64 build-go-amd package-deb-doc
+	mv debian.deb conbee_$(version)_amd64.deb
+
+upload :
+	scp package/build/conbee_$(version)_armhf.deb $(remote_host):~/
 
-deb-arm : clean configure-arm build-go-arm package-deb-doc-1
-	mv package/debian.deb package/build/conbee-ad_$(version)_armhf.deb
+upload-install : upload
+	ssh -t $(remote_host) "sudo dpkg -i conbee_$(version)_armhf.deb"
 
-deb-amd : configure-amd64 build-go-amd package-deb-doc-1
-	mv debian.deb conbee-ad_$(version)_amd64.deb
+remote-install : deb-arm upload
+	ssh -t $(remote_host) "sudo dpkg -i conbee_$(version)_armhf.deb"
 
 run :
 	go run src/service.go -c testdata/var/config.json
 
+publish-reprepo:
+	scp package/build/conbee_$(version)_armhf.deb $(reprepo_host):~/apps
 
 .phony : clean

README.md

@@ -1 +1,7 @@
 Thingsplex  service 
+
+
+Deconz manual update : 
+
+- `wget http://deconz.dresden-elektronik.de/raspbian/<package-name>`
+- `dpkg -i <package_name>`  

VERSION

@@ -0,0 +1 @@
+0.3.4

package/debian/DEBIAN/control

@@ -0,0 +1,7 @@
+Package: conbee
+Version: 0.3.4
+Section: non-free/misc
+Priority: optional
+Architecture: armhf
+Maintainer: Aleksandrs Livincovs <aleksandrs.livincovs@gmail.com>
+Description: Conbee zigbee adapter for futurehome.

package/debian1/DEBIAN/postinst → package/debian/DEBIAN/postinst

@@ -41,7 +41,9 @@ add_user_and_group()
 
 set_ownership()
 {
-	chown -R conbee-ad:thingsplex "/opt/thingsplex/conbee-ad"
+	chown -R conbee-ad:thingsplex "/opt/thingsplex/conbee"
+	chmod 755 /var/log/thingsplex/conbee || true
+	chown conbee-ad:thingsplex /var/log/thingsplex/conbee || true
 }
 
 
@@ -50,18 +52,11 @@ case "$1" in
 	    echo "Configuring.."
 		add_user_and_group
 		set_ownership
-		migrate_fimpflows
-        if [ ! -d /var/log/thingsplex ]
-        then
-            echo "Setting up logging dir"
-            mkdir -m 774 /var/log/thingsplex
-            chown conbee-ad:thingsplex /var/log/thingsplex
-        fi
-		# Start thingsplex
-		if [ -f /opt/thingsplex/conbee-ad/conbee-ad ]
+		# Start conbee-ad
+		if [ -f /opt/thingsplex/conbee/conbee ]
 		then
-		    systemctl enable conbee-ad.service
-			systemctl start conbee-ad.service
+		    systemctl enable conbee.service || true
+			systemctl start conbee.service || true
 		fi
 	;;
 

package/debian2/DEBIAN/preinst → package/debian/DEBIAN/preinst

@@ -17,9 +17,9 @@ set -e
 case "$1" in
 	install|upgrade)
 		# Stop service if vinculum is running
-		if [ -d /opt/thingsplex/things_plex_service_template ]
+		if [ -d /opt/thingsplex/conbee/conbee ]
 		then
-			systemctl stop things_plex_service_template.service
+			systemctl stop conbee.service || true
 		fi
 	;;
 

package/debian/DEBIAN/prerm

@@ -0,0 +1,3 @@
+#!/bin/bash
+systemctl stop conbee.service || true
+systemctl disable conbee.service || true