pandora-scripts / gui.conf: Added new stop command for minimenu (fixes wrong settings...

[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 b195a7d..251137d 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@ -2,29 +2,24 @@
 #
 # Released under the GPL
 
-STARTUP=0
-
-if [ ${1} = startup ]; then
- STARTUP=1
-fi
-
 INTERFACE="`hciconfig | grep "^hci" | cut -d ':' -f 1`"
 
-if [ ${STARTUP} = 1 ]; then
+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
-
+       
        # Figure out if Bluetooth is running or not
        
        if [ "`hciconfig ${INTERFACE} | grep UP`" ]
        then
-               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i /usr/share/icons/hicolor/32x32/apps/bluetooth.png
+               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i /usr/share/icons/hicolor/32x32/apps/blueman.png
                sudo /usr/sbin/hciconfig ${INTERFACE} down
                rm ~/.op_btenabled
        else
                pgrep bluetoothd
-               if [ $? -ne 1 ]; then
-                       notify-send -u normal "Bluetooth" "Bluetooth is being enabled..." -i /usr/share/icons/hicolor/32x32/apps/bluetooth.png
+               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