version update & script clean-up

Author: winemug

scripts/bt-reset.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+sudo systemctl disable omnipy-pan.service
+sudo systemctl stop omnipy-pan.service
+
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which hciconfig`
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which hcitool`
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which btmgmt`
@@ -8,9 +11,6 @@ sudo setcap 'cap_net_raw,cap_net_admin+eip' `which bt-device`
 sudo find /usr/local -name bluepy-helper -exec setcap 'cap_net_raw,cap_net_admin+eip' {} \;
 sudo find /home/pi -name bluepy-helper -exec setcap 'cap_net_raw,cap_net_admin+eip' {} \;
 
-sudo systemctl stop omnipy-pan.service
-sudo systemctl disable omnipy-pan.service
-
 sudo btmgmt power off
 sudo btmgmt power on
 

scripts/image/setup.sh

@@ -13,7 +13,7 @@ sudo raspi-config
 
 
 sudo apt update && sudo apt upgrade -y
-sudo apt install -y screen git python3 python3-pip vim jq bluez-tools
+sudo apt install -y screen git python3 python3-pip vim jq bluez-tools libglib2.0-dev
 #expect build-essential libglib2.0-dev libdbus-1-dev libudev-dev libical-dev libreadline-dev rpi-update
 #reboot
 
@@ -31,31 +31,29 @@ git clone https://github.com/winemug/bluepy.git
 
 
 #sudo /bin/rm /boot/.firmware_revision
-sudo cp /home/pi/omnipy/scripts/image/rpiupdate.sh /usr/bin/rpiupdate
-sudo git clone https://github.com/Hexxeh/rpi-firmware.git /root/.rpi-firmware
+#sudo cp /home/pi/omnipy/scripts/image/rpiupdate.sh /usr/bin/rpiupdate
+#sudo git clone https://github.com/Hexxeh/rpi-firmware.git /root/.rpi-firmware
 #sudo ROOT_PATH=/ BOOT_PATH=/boot SKIP_DOWNLOAD=0 SKIP_REPODELETE=1 SKIP_BACKUP=1 UPDATE_SELF=0 RPI_REBOOT=1 BRANCH=next rpi-update 502a515156eebbfd3cc199de8f38a975c321f20d
 #reboot
-wget https://github.com/Hexxeh/rpi-firmware/archive/master.zip
-unzip master.zip
-sudo mv rpi-firmware-master /root/.rpi-firmware
+#wget https://github.com/Hexxeh/rpi-firmware/archive/master.zip
+#unzip master.zip
+#sudo mv rpi-firmware-master /root/.rpi-firmware
 
 
 #https://raspberrypi.stackexchange.com/questions/66540/installing-bluez-5-44-onto-raspbian
-wget https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.gz
-tar xzf bluez-5.50.tar.gz
-cd bluez-5.50
-./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc --localstatedir=/var --disable-cups --disable-a2dp --disable-avrcp --disable-hid --disable-hog --enable-experimental
-make -j4
-sudo make install
-
-cd /usr/lib/bluetooth/
-sudo mv bluetoothd bluetoothd.old
-sudo mv obexd obexd.old
-
-sudo ln -s /usr/libexec/bluetooth/bluetoothd /usr/lib/bluetooth/bluetoothd
-sudo ln -s /usr/libexec/bluetooth/obexd /usr/lib/bluetooth/obexd
-
-sudo systemctl daemon-reload
+#wget https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.gz
+#tar xzf bluez-5.50.tar.gz
+#cd bluez-5.50
+#./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc --localstatedir=/var --disable-cups --disable-a2dp --disable-avrcp --disable-hid --disable-hog --enable-experimental
+#make -j4
+#sudo make install
+
+#cd /usr/lib/bluetooth/
+#sudo mv bluetoothd bluetoothd.old
+#sudo mv obexd obexd.old
+#sudo ln -s /usr/libexec/bluetooth/bluetoothd /usr/lib/bluetooth/bluetoothd
+#sudo ln -s /usr/libexec/bluetooth/obexd /usr/lib/bluetooth/obexd
+#sudo systemctl daemon-reload
 
 sudo pip3 install simplejson Flask cryptography requests
 

scripts/pi-update.sh

@@ -18,12 +18,12 @@ git pull
 
 echo
 echo "Stopping omnipy services"
-sudo systemctl stop omnipy.service
-sudo systemctl stop omnipy-beacon.service
-sudo systemctl stop omnipy-pan.service
 sudo systemctl disable omnipy.service
 sudo systemctl disable omnipy-beacon.service
 sudo systemctl disable omnipy-pan.service
+sudo systemctl stop omnipy.service
+sudo systemctl stop omnipy-beacon.service
+sudo systemctl stop omnipy-pan.service
 
 
 /bin/bash /home/pi/omnipy/scripts/pi-update-finalize.sh

scripts/recovery.sh

@@ -33,11 +33,11 @@ iw dev ${WLAN_INTERFACE} set power_save off
 if [[ -f ${PW_RESET_FILE} ]]; then
 
         echo "pi:omnipy" | chpasswd
-        systemctl stop omnipy.service > /dev/null 2>&1
     	mkdir -p /home/pi/omnipy/data
         rm /home/pi/omnipy/data/key
         cp /home/pi/omnipy/scripts/recovery.key /home/pi/omnipy/data/key
         chown -R pi.pi /home/pi
+        systemctl stop omnipy.service > /dev/null 2>&1
         systemctl start omnipy.service > /dev/null 2>&1
         /bin/rm ${PW_RESET_FILE}
 fi