various script fixes for bt tethering

Author: winemug

scripts/bt-expect.sh

@@ -1,47 +1,48 @@
 #!/usr/bin/expect -f
 
-set timeout 900
+set timeout 1200
 
 set prompt "#"
 
 spawn sudo bluetoothctl
 expect -re $prompt
 send "power on\r"
-sleep 1
+sleep 2
 
 expect -re $prompt
 send "agent NoInputNoOutput\r"
-sleep 1
+sleep 2
 
 expect -re $prompt
 send "default-agent\r"
-sleep 1
+sleep 2
 
 expect -re $prompt
 send "agent DisplayOnly\r"
-sleep 1
+sleep 2
 
 expect -re $prompt
 send "default-agent\r"
-sleep 1
+sleep 2
 
 expect -re $prompt
-send "discoverable on\r"
-sleep 1
+send "pairable on\r"
+sleep 2
 
 expect -re $prompt
-send "pairable on\r"
-sleep 1
+send "discoverable on\r"
+sleep 2
 
 expect -re "Enter PIN code: "
 sleep 3
 send "3434\r"
 
 expect -re "Connected: yes"
-sleep 10
+sleep 15
+
 expect -re $prompt
 send "discoverable off\r"
-sleep 1
+sleep 3
 
 expect -re $prompt
 send "pairable off\r"

scripts/bt-setup.sh

@@ -5,16 +5,15 @@ sudo setcap 'cap_net_raw,cap_net_admin+eip' `which btmgmt`
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which bt-agent`
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which bt-network`
 sudo setcap 'cap_net_raw,cap_net_admin+eip' `which bt-device`
-sudo find / -name bluepy-helper -exec setcap 'cap_net_raw,cap_net_admin+eip' {} \;
+sudo find /usr/lib -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 rm /etc/systemd/system/omnipy-pan.service
+sudo rm -f /etc/systemd/system/omnipy-pan.service
 sudo systemctl reset-failed
-rm /home/pi/omnipy/scripts/btnap-custom.sh
+rm -f /home/pi/omnipy/scripts/btnap-custom.sh
 
-echo
-echo "Removing existing bluetooth devices"
 sudo btmgmt power on
 sudo bt-device -l | grep -e \(.*\) --color=never -o| cut -d'(' -f2 | cut -d')' -f1 | while read -r mac
 do
@@ -24,10 +23,8 @@ do
         fi
 done
 
-echo
-echo "Activating bluetooth pairing mode"
-
 sudo hciconfig hci0 sspmode 0
+sudo btmgmt connectable on
 
 /usr/bin/expect -f /home/pi/omnipy/scripts/bt-expect.sh
 
@@ -36,10 +33,13 @@ sudo hciconfig hci0 sspmode 1
 btdevice=`sudo bt-device -l | grep -e \(.*\)`
 mac=`echo $btdevice | cut -d'(' -f2 | cut -d')' -f1`
 
-echo
-
-echo "addr=$mac" > /home/pi/omnipy/scripts/btnap-custom.sh
-cat /home/pi/omnipy/scripts/btnap.sh >> /home/pi/omnipy/scripts/btnap-custom.sh
-sudo cp /home/pi/omnipy/scripts/omnipy-pan.service /etc/systemd/system/
-sudo systemctl enable omnipy-pan.service
-sudo systemctl start omnipy-pan.service
+if [[ ! -z "$mac" ]]; then
+	echo "Paired with $btdevice"
+	echo "addr=$mac" > /home/pi/omnipy/scripts/btnap-custom.sh
+	cat /home/pi/omnipy/scripts/btnap.sh >> /home/pi/omnipy/scripts/btnap-custom.sh
+	sudo cp /home/pi/omnipy/scripts/omnipy-pan.service /etc/systemd/system/
+	sudo systemctl enable omnipy-pan.service
+	sudo systemctl start omnipy-pan.service
+else
+	echo "bt pairing failed"
+fi