op_bluetooth: update for new kernel

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_bluetooth.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
index 506a842..b63fe76 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@ -2,23 +2,36 @@
 #
 # Released under the GPL
 
-SILENT=0
-while getopts s opt
-do
-       case "$opt" in
-               s) SILENT=1;;
-       esac
-done
+INTERFACE="`hciconfig | grep "^hci" | cut -d ':' -f 1`"
+LOCK=".op_btenabled"
+cd "$HOME"
 
-INTERFACE=`hciconfig | grep "^hci" | cut -d ':' -f 1`
-pgrep bluetoothd
-if [ $? = 1 ]; then
-       notify-send "Bluetooth" "The bluetooth interface is being set up..." -i /usr/share/icons/hicolor/32x32/apps/blueman.png
-       sudo /usr/sbin/hciconfig ${INTERFACE} down
-       sudo /usr/sbin/hciconfig ${INTERFACE} up pscan
-       sudo /usr/sbin/bluetoothd
-fi
+if [ "$1" = "startup" ]; then
+       [ -f "$LOCK" ] && sudo /usr/sbin/hciconfig "$INTERFACE" up pscan 1>/dev/null && sudo /usr/sbin/bluetoothd || echo "Bluetooth: User has not enabled Bluetooth." 
+
+else   
+       # Figure out if Bluetooth is running or not
+       
+       if hciconfig "$INTERFACE" | grep UP &>/dev/null
+       then
+               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i blueman -t 5000
+               sudo /usr/sbin/hciconfig ${INTERFACE} down 1>/dev/null
+               sudo /usr/pandora/scripts/op_bluetooth_work.sh 0
+               rm -f "$LOCK"
+       else
+               if ! sudo /usr/pandora/scripts/op_bluetooth_work.sh 1; then
+                       notify-send -u normal "Bluetooth" "Bluetooth error" -i blueman -t 3000
+                       exit 1
+               fi
 
-if [ ${SILENT} = 0 ]; then
-       bluetooth-wizard
+               pgrep bluetoothd
+               echo $INTERFACE
+                if [ $? -ne 1 ]; then
+                       notify-send -u normal "Bluetooth" "Bluetooth is being enabled..." -i blueman -t 5000
+                       sudo /usr/sbin/hciconfig ${INTERFACE} down 1>/dev/null
+                       sudo /usr/sbin/hciconfig ${INTERFACE} up pscan 1>/dev/null
+                       sudo /usr/sbin/bluetoothd 1>/dev/null
+                       touch "$LOCK"
+               fi
+       fi
 fi