op_power: try to handle mounted-cards-on-suspend mess

[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 0b3d8d3..2d5b79a 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@ -3,30 +3,36 @@
 # Released under the GPL
 
 INTERFACE="`hciconfig | grep "^hci" | cut -d ':' -f 1`"
+LOCK=".op_btenabled"
+cd "$HOME"
 
-if [ ${1} = "startup" ]; then
-       [ -f ~/.op_btenabled ] && sudo /usr/sbin/hciconfig ${INTERFACE} up pscan && sudo /usr/sbin/bluetoothd ||echo "Bluetooth: User has not enabled Bluetooth." 
-else
-       
+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`" ]
+       if hciconfig "$INTERFACE" | grep UP &>/dev/null
        then
-               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i /usr/share/icons/hicolor/32x32/apps/blueman.png
-               sudo /usr/sbin/hciconfig ${INTERFACE} down
-               sudo killall btaddconn
-                sudo killall btdelconn
-               rm ~/.op_btenabled
+               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i blueman -t 5000
+               sudo /usr/sbin/hciconfig ${INTERFACE} down 1>/dev/null
+               rm -f "$LOCK"
        else
+            kernel_major=`uname -r | cut -c 1`
+            if [ "$kernel_major" = "3" ]; then
+               zenity --info --title="Bluetooth not supported" --text "Sorry, the experimental kernel does not support Bluetooth (yet).\n\nIt could not be enabled."
+             exit 1
+            else
                pgrep bluetoothd
                echo $INTERFACE
                 if [ $? -ne 1 ]; then
-                       notify-send -u normal "Bluetooth" "Bluetooth is being enabled..." -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
-                       rm ~/.op_btenabled
-                       echo true > ~/.op_btenabled
+                       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
 fi