fixed detaching/destroying of loop devices.

[pandora-libraries.git] / testdata / scripts / op_power.sh

diff --git a/testdata/scripts/op_power.sh b/testdata/scripts/op_power.sh
index 98354b3..0cc8188 100755 (executable)
--- a/testdata/scripts/op_power.sh
+++ b/testdata/scripts/op_power.sh
@@ -8,7 +8,7 @@ if [ "$1" -le "3" ]; then # button was pressed 1-3sec, "suspend"
   else
     powerstate=0
   fi
-  if [$powerstate -eq 1 ]; then
+  if [ $powerstate -eq "1" ]; then
     #in lowpower mode
     echo 0 > /tmp/powerstate
     oldbright=$(cat /tmp/oldbright)
@@ -19,11 +19,13 @@ if [ "$1" -le "3" ]; then # button was pressed 1-3sec, "suspend"
     else
       /usr/pandora/scripts/op_bright.sh $maxbright
     fi
-    if [ $oldspeed -ge 14 ] && [ $oldspeed -le 1000 ]; then 
+    if [ $oldspeed -gt 14 ] && [ $oldspeed -le 1000 ]; then 
      echo $oldspeed > /proc/pandora/cpu_mhz_max 
     else
       echo 500 > /proc/pandora/cpu_mhz_max
     fi
+    hciconfig hci0 up
+    /etc/init.d/wl1251-init start
     pidlist=$(pstree -lpA | grep pnd_run.sh | sed -ne 's/.*(\([0-9]\+\))/\1/p')
     for PID in $pidlist
     do
@@ -40,11 +42,26 @@ if [ "$1" -le "3" ]; then # button was pressed 1-3sec, "suspend"
       kill -19 $PID #send SIGSTOP
     done
     hciconfig hci0 down
-    /etc/init.d/S30wlxxx-init stop
+    /etc/init.d/wl1251-init stop
     echo 0 > /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness
     echo 14 > /proc/pandora/cpu_mhz_max
   fi
 elif [ "$1" -ge "4" ]; then #button was pressed 4 sec or longer, shutdown
+  xfceuser=$(ps u -C xfce4-session | tail -n1 | awk '{print $1}')
+  time=10
+  countdown () {
+    for i in $(seq $time); do
+      precentage=$(echo $i $time | awk '{ printf("%f\n", $1/$2*100) }')
+      echo $precentage
+      echo "# Shutdown in $i"
+      sleep 1
+    done
+  }
+  countdown  | su -c 'DISPLAY=:0.0  zenity --progress --auto-close --text "Shutdown in X" --title "Shutdown"' $xfceuser
+  if [ $? -eq 0 ]; then
   shutdown -h now
+  else
+  su -c 'DISPLAY=:0.0  zenity --error --text "Shutdown aborted!"' $xfceuser
+  fi
 fi