Fix packaging and service scripts

Author: tve

DEBIAN/control

@@ -1,9 +1,9 @@
 Package: sg-control
-Version: 1.0
+Version: 0
 Architecture: armhf
 Essential: no
-Depends: 
-Homepage: https://github.com/sensorgnome-control
+Depends: nodejs
+Homepage: https://github.com/sensorgnome/sensorgnome-control
 Maintainer: TvE ([email protected])
 Description: Sensorgnome main control process
   Orchestrates all tag detection, processing, transmission and web activities.

DEBIAN/postinst

@@ -1,6 +1,14 @@
 #! /bin/bash -ex
 echo "Running sg-control postinst in $(pwd)"
-MISC=/opt/sensorgnome/control # would be nice to derive that from some env var...
+SG=/opt/sensorgnome # would be nice to derive that from some env var...
+
+# install the default deployment.txt if there is none
+# some trickery to get a case-insensitive match of deployment.txt
+DC=/data/config
+if ! echo $DC/* | egrep -iq /deployment.txt; then
+    echo "Installing default deployment.txt"
+    cp $SG/templates/deployment.txt $DC/deployment.txt
+fi
 
 # enable and start/restart units
 for U in sg-control; do

defaultDeployment.txt renamed to default-deployment.txt

@@ -1,21 +1,29 @@
 #! /bin/bash -e
 DESTDIR=build-temp
-rm -rf $DESTDIR
+sudo rm -rf $DESTDIR
 mkdir $DESTDIR
 
-(cd src; npm update)
+# npm update to pull in the latest versions of all dependencies
+(cd src; npm --no-fund update)
 
-DEST=$DESTDIR/opt/sensorgnome/control
-install -d $DEST
-cp -r src $DEST
+# install the control application files as user pi=1000
+SG=$DESTDIR/opt/sensorgnome
+install -d $SG/control
+cp -r src/* $SG/control
+sudo chown -R 1000:1000 $SG/control
 
-install -d $DESTDIR/data/config
-install -m 644 defaultDeployment.txt $DESTDIR/data/config/DEPLOYMENT.TXT
-install -d $DESTDIR/etc/systemd/system
-install -m 644 *.service $DESTDIR/etc/systemd/system
+# install default deployment file into templates dir
+# (can't install to /data/config 'cause that may be on FAT32 and dpkg will fail setting perms)
+sudo install -d $DESTDIR/opt/sensorgnome/templates -o 1000 -g 1000
+sudo install -o 1000 -g 1000 -m 644 default-deployment.txt $DESTDIR/opt/sensorgnome/templates/deployment.txt
+
+# service file should be owned by root
+sudo install -d $DESTDIR/etc/systemd/system -o 0 -g 0
+sudo install -m 644 -o 0 -g 0 *.service $DESTDIR/etc/systemd/system
 
 cp -r DEBIAN $DESTDIR
+sed -e "/^Version/s/:.*/: $(date +%Y.%j)/" -i $DESTDIR/DEBIAN/control # set version: YYYY.DDD
 mkdir -p packages
-dpkg-deb -v --build $DESTDIR packages/sg-control.deb
-# dpkg-deb --contents packages/sg-control.deb
-ls -lh packages/sg-control.deb
+dpkg-deb --build $DESTDIR packages
+# dpkg-deb --contents packages
+ls -lh packages

gen-package.sh

@@ -1,20 +1,20 @@
 [Unit]
 Description=Sensorgnome main control process.
-WorkingDirectory=/opt/sensorgnome/control
-After=sg-boot, sg-gps-link, chrony, sg-usb-init, sg-wifi-init, gestures
+After=sg-boot sg-gps-link chronyd sg-usb-init
+Requires=sg-boot sg-gps-link chronyd sg-usb-init
 
 [Service]
 Type=exec
-#FIXME: if ! grep -q NO_AUTO_FCD_UPDATE /data/config/deployment.txt; then
-#ExecStartPre=/opt/sensorgnome/fcd/update_fcd_firmware.sh
-ExecStartPre=/bin/bash -c 'echo "*** Starting sensorgnome control app $(date)" >/var/log/nodelog.txt'
+WorkingDirectory=/opt/sensorgnome/control
 Environment=NODE_ENV=production
-Environment=VAMP_PATH=/opt/vamp
+Environment=NODE_PATH=/opt/sensorgnome/control
 Environment=LC_ALL="C.UTF-8"
-ExecStart=/usr/bin/nice -n -15 "/usr/bin/node ./main.js >>/var/log/nodelog.txt 2>&1"
-ExecStartPost=/usr/bin/killall -KILL rtl_tcp vamp-alsa-host chronyc
+ExecStartPre=/bin/bash -c 'echo "*** Starting sensorgnome control app $(date)" >/var/log/nodelog.txt'
+ExecStartPre=-/usr/bin/ln -s /data/SGdata /media/SD_card
+ExecStart=/bin/bash -c "nice -n -15 node main >>/var/log/nodelog.txt 2>&1"
+ExecStartPost=-/usr/bin/killall -KILL rtl_tcp vamp-alsa-host chronyc
 Restart=always
-RestartSec=60
+RestartSec=60s
 
 [Install]
 WantedBy=multi-user.target