v1.4.3 build script

Author: winemug

podcomm/definitions.py

@@ -25,7 +25,7 @@
 API_VERSION_MAJOR = 1
 API_VERSION_MINOR = 4
 API_VERSION_REVISION = 3
-API_VERSION_BUILD = 19211
+API_VERSION_BUILD = 19212
 
 REST_URL_PING = "/omnipy/ping"
 REST_URL_OMNIPY_SHUTDOWN = "/omnipy/shutdown"

scripts/image/setup.sh

@@ -5,7 +5,6 @@ sudo passwd pi
 sudo raspi-config
 
 # hostname: omnipy
-# wifi: NO, noway, omnipyway
 # adv, memory split, 16
 # enable predictive intf names
 # timezone other/utc
@@ -18,20 +17,20 @@ sudo apt install -y screen git python3 python3-pip vim jq bluez-tools libglib2.0
 #reboot
 
 
-sudo apt install -y hostapd dnsmasq
-sudo systemctl disable hostapd
-sudo systemctl unmask hostapd
-sudo systemctl disable dnsmasq
-sudo systemctl enable hostapd
-sudo systemctl enable dnsmasq
-sudo systemctl start hostapd
-sudo systemctl stop hostapd
-sudo systemctl stop dnsmasq
-sudo cp /home/pi/omnipy/scripts/image/default.dnsmasq /etc/default/dnsmasq
-sudo cp /home/pi/omnipy/scripts/image/default.hostapd /etc/default/hostapd
-sudo cp /home/pi/omnipy/scripts/image/hostapd.conf /etc/hostapd/
-sudo cp /home/pi/omnipy/scripts/image/dnsmasq.conf /etc/dnsmasq.d/
-sudo cp /home/pi/omnipy/scripts/image/dhcpcd.conf /etc/
+# sudo apt install -y hostapd dnsmasq
+# sudo systemctl disable hostapd
+# sudo systemctl unmask hostapd
+# sudo systemctl disable dnsmasq
+# sudo systemctl enable hostapd
+# sudo systemctl enable dnsmasq
+# sudo systemctl start hostapd
+# sudo systemctl stop hostapd
+# sudo systemctl stop dnsmasq
+# sudo cp /home/pi/omnipy/scripts/image/default.dnsmasq /etc/default/dnsmasq
+# sudo cp /home/pi/omnipy/scripts/image/default.hostapd /etc/default/hostapd
+# sudo cp /home/pi/omnipy/scripts/image/hostapd.conf /etc/hostapd/
+# sudo cp /home/pi/omnipy/scripts/image/dnsmasq.conf /etc/dnsmasq.d/
+# sudo cp /home/pi/omnipy/scripts/image/dhcpcd.conf /etc/
 sudo cp /home/pi/omnipy/scripts/image/rc.local /etc/
 
 git config --global user.email "omnipy@balya.net"
@@ -107,6 +106,7 @@ sudo touch /boot/omnipy-expandfs
 sudo touch /boot/omnipy-btreset
 sudo touch /boot/omnipy-hotspot
 
+rm /etc/wpa_supplicant/wpa_supplicant.conf
 rm /home/pi/.bash_history
 #wpa?
 sudo halt

scripts/pi-update-finalize.sh

@@ -1,23 +1,23 @@
 #!/usr/bin/env bash
 echo
 echo Updating service scripts and restarting services
+# remnants of hotspot
+sudo apt remove hostapd dnsmasq -y > /dev/null 2>&1
 sudo apt update && sudo apt upgrade -y
 
 echo Ensure installation of packages needed in v1.4.1
-sudo apt install -y python3-rpi.gpio hostapd dnsmasq
-sudo systemctl disable hostapd
-# sudo systemctl unmask hostapd
-sudo systemctl disable dnsmasq
-# sudo systemctl enable hostapd
-# sudo systemctl enable dnsmasq
-# sudo systemctl start hostapd
-# sudo systemctl stop hostapd
-# sudo systemctl stop dnsmasq
-sudo cp /home/pi/omnipy/scripts/image/default.dnsmasq /etc/default/dnsmasq
-sudo cp /home/pi/omnipy/scripts/image/default.hostapd /etc/default/hostapd
-sudo cp /home/pi/omnipy/scripts/image/hostapd.conf /etc/hostapd/
-sudo cp /home/pi/omnipy/scripts/image/dnsmasq.conf /etc/dnsmasq.d/
-sudo cp /home/pi/omnipy/scripts/image/dhcpcd.conf /etc/
+sudo apt install -y python3-rpi.gpio
+
+# remnants of hotspot
+sudo systemctl stop omnipy-hotspot.service > /dev/null 2>&1
+sudo systemctl disable omnipy-hotspot.service > /dev/null 2>&1
+sudo rm /etc/systemd/system/omnipy-hotspot.service > /dev/null 2>&1
+
+# sudo cp /home/pi/omnipy/scripts/image/default.dnsmasq /etc/default/dnsmasq
+# sudo cp /home/pi/omnipy/scripts/image/default.hostapd /etc/default/hostapd
+# sudo cp /home/pi/omnipy/scripts/image/hostapd.conf /etc/hostapd/
+# sudo cp /home/pi/omnipy/scripts/image/dnsmasq.conf /etc/dnsmasq.d/
+# sudo cp /home/pi/omnipy/scripts/image/dhcpcd.conf /etc/
 sudo cp /home/pi/omnipy/scripts/image/rc.local /etc/
 
 
@@ -34,18 +34,13 @@ sudo chown -R pi.pi /home/pi
 sudo cp /home/pi/omnipy/scripts/omnipy-pan.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/omnipy.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/omnipy-beacon.service /etc/systemd/system/
-sudo cp /home/pi/omnipy/scripts/omnipy-hotspot.service /etc/systemd/system/
-sudo rm /etc/systemd/system/omnipy-hotspot.service
 
 sudo systemctl enable omnipy.service
 sudo systemctl enable omnipy-beacon.service
 sudo systemctl enable omnipy-pan.service
-# sudo systemctl disable omnipy-hotspot.service
 sudo systemctl start omnipy.service
 sudo systemctl start omnipy-beacon.service
 sudo systemctl start omnipy-pan.service
-# sudo systemctl start omnipy-hotspot.service
-sudo systemctl daemon-reload
 
 echo
 echo Configuration updated.

scripts/pi-update.sh

@@ -21,7 +21,6 @@ echo "Stopping omnipy services"
 sudo systemctl stop omnipy.service
 sudo systemctl stop omnipy-beacon.service
 sudo systemctl stop omnipy-pan.service
-sudo systemctl stop omnipy-hotspot.service
 
 
 /bin/bash /home/pi/omnipy/scripts/pi-update-finalize.sh