setup for buster upgrade

Author: winemug

mq.py

@@ -24,7 +24,7 @@ def __init__(self):
 
         with open("settings.json", "r") as stream:
             self.settings = json.load(stream)
-        self.client = mqtt.Client(client_id=self.configuration.mqtt_clientid, protocol=mqtt.MQTTv311)
+        self.client = mqtt.Client(client_id=self.settings["mqtt_clientid"], protocol=mqtt.MQTTv311)
         self.client.on_connect = self.on_connect
         self.client.on_disconnect = self.on_disconnect
         self.client.on_message = self.on_message

podcomm/definitions.py

@@ -1,7 +1,6 @@
-from enum import IntEnum
-import os
 import logging
-from logging.handlers import MemoryHandler
+import os
+from enum import IntEnum
 
 DATA_PATH = "./data/"
 

requirements.txt

@@ -0,0 +1,19 @@
+certifi==2020.6.20
+chardet==3.0.4
+click==7.1.2
+crypto==1.4.1
+Flask==1.1.2
+idna==2.10
+itsdangerous==1.1.0
+Jinja2==2.11.2
+MarkupSafe==1.1.1
+Naked==0.1.31
+paho-mqtt==1.5.0
+pkg-resources==0.0.0
+PyYAML==5.3.1
+requests==2.24.0
+RPi.GPIO==0.7.0
+shellescape==3.8.1
+simplejson==3.17.2
+urllib3==1.25.9
+Werkzeug==1.0.1

restapi.py

@@ -557,7 +557,7 @@ def update_omnipy():
     pdm = _get_pdm()
     while pdm.is_busy():
         time.sleep(1)
-    os.system("/bin/bash /home/pi/omnipy/scripts/pi-update.sh")
+    os.system("/bin/bash /home/pi/omnipy/scripts/update.sh")
     return {"update started": time.time()}
 
 

scripts/console-ui.sh

@@ -222,13 +222,13 @@ function DeveloperMenu(){
 
 			4)
 				echo "Stop services"
-				sudo systemctl stop omnipy.service
+				sudo systemctl stop omnipy-rest.service
 				sudo systemctl stop omnipy-beacon.service
 				sudo systemctl stop omnipy-pan.service
 
 				Services_Status=
 
-				if $(systemctl -q is-active omnipy.service)
+				if $(systemctl -q is-active omnipy-rest.service)
 				then
  					Services_Status="Failed: Omnipy Service has not been stopped\n"
 				else
@@ -257,14 +257,14 @@ function DeveloperMenu(){
 
 			5)
 				echo "Restart services"
-				sudo systemctl restart omnipy.service
+				sudo systemctl restart omnipy-rest.service
 				sudo systemctl restart omnipy-beacon.service
 				sudo systemctl restart omnipy-pan.service
 
 
 				Services_Status=
 
-                                if $(systemctl -q is-active omnipy.service)
+                                if $(systemctl -q is-active omnipy-rest.service)
                                 then
                                         Services_Status="Success: Omnipy Service has been restarted successfully\n"
                                 else