setup for buster upgrade

Author: winemug

mq.py

@@ -1,3 +1,5 @@
+#!/home/pi/v/bin/python3
+
 import glob
 import sqlite3
 import time

omni.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/home/pi/v/bin/python3
 
 from podcomm.definitions import *
 import requests

omnipy_beacon.py

@@ -1,3 +1,4 @@
+#!/home/pi/v/bin/python3
 
 from socketserver import UDPServer, BaseRequestHandler
 from podcomm.definitions import getLogger, configureLogging

requirements.txt

@@ -10,6 +10,7 @@ MarkupSafe==1.1.1
 Naked==0.1.31
 paho-mqtt==1.5.0
 pkg-resources==0.0.0
+pycrypto==2.6.1
 PyYAML==5.3.1
 requests==2.24.0
 RPi.GPIO==0.7.0

restapi.py

@@ -1,3 +1,4 @@
+#!/home/pi/v/bin/python3
 from threading import Thread
 import signal
 import base64

scripts/recovery.key scripts/image/recovery.keyscripts/recovery.key renamed to scripts/image/recovery.key

@@ -32,7 +32,7 @@ git clone https://github.com/winemug/bluepy.git
 
 mkdir -p /home/pi/omnipy/data
 rm /home/pi/omnipy/data/key
-cp /home/pi/omnipy/scripts/recovery.key /home/pi/omnipy/data/key
+cp /home/pi/omnipy/scripts/image/recovery.key /home/pi/omnipy/data/key
 
 ### omnipy-base image end
 
@@ -69,13 +69,14 @@ sudo find /home/pi -name blescan -exec setcap 'cap_net_raw,cap_net_admin+eip' {}
 sudo find /home/pi -name sensortag -exec setcap 'cap_net_raw,cap_net_admin+eip' {} \;
 sudo find /home/pi -name thingy52 -exec setcap 'cap_net_raw,cap_net_admin+eip' {} \;
 
-python3 -m pip install rpi-gpio simplejson paho-mqtt requests crypto flask
+python3 -m pip install rpi-gpio simplejson paho-mqtt requests crypto flask pycrypto
 
 
 # services
 
+chmod -R 755 /home/pi/omnipy/scripts/*.sh
+chmod -R 755 /home/pi/omnipy/*.py
 sudo cp /home/pi/omnipy/scripts/image/rc.local /etc/
-
 sudo cp /home/pi/omnipy/scripts/image/omnipy-rest.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/image/omnipy-mq.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/image/omnipy-beacon.service /etc/systemd/system/
@@ -92,9 +93,8 @@ sudo touch /boot/omnipy-pwreset
 sudo touch /boot/omnipy-expandfs
 sudo touch /boot/omnipy-btreset
 
-sudo halt
+#fin
 
-######
 
 sudo umount /dev/sdh1
 sudo umount /dev/sdh2

scripts/image/setup.sh

@@ -24,7 +24,7 @@ if [[ -f ${PW_RESET_FILE} ]]; then
         echo "pi:omnipy" | chpasswd
       	mkdir -p /home/pi/omnipy/data
         rm /home/pi/omnipy/data/key
-        cp /home/pi/omnipy/scripts/recovery.key /home/pi/omnipy/data/key
+        cp /home/pi/omnipy/scripts/image/recovery.key /home/pi/omnipy/data/key
         /bin/rm ${PW_RESET_FILE}
         /sbin/shutdown -r now
 fi
@@ -37,4 +37,5 @@ fi
 
 if [[ -f ${UPGRADE_FILE} ]]; then
         su -c "/bin/bash /home/pi/omnipy/scripts/update.sh &" pi
+        /sbin/shutdown -r now
 fi

scripts/recovery.sh

@@ -1,4 +1,5 @@
-#!/usr/bin/python3
+#!/home/pi/v/bin/python3
+
 import hashlib
 from podcomm.definitions import *
 

set_api_password.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/home/pi/v/bin/python3
 from podcomm.pr_rileylink import RileyLink
 from podcomm.definitions import *