op_osupgrade: rework update script

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

diff --git a/recipes/pandora-system/pandora-scripts/op_datetime.sh b/recipes/pandora-system/pandora-scripts/op_datetime.sh
index d704437..3debe69 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_datetime.sh
+++ b/recipes/pandora-system/pandora-scripts/op_datetime.sh
@@ -62,15 +62,23 @@ case $mainsel in
   fi
   ;;
   "sync")
+  screensaver_enabled=true
+  if xset q | grep -A2 'Screen Saver' | grep -q 'timeout:.*\<0\>.*cycle'; then
+    screensaver_enabled=false
+  fi
+  xset s off
   (
-  sudo /etc/init.d/ntpd stop
+  test -e /etc/init.d/ntpd && sudo /etc/init.d/ntpd stop
   sudo ntpdate pool.ntp.org
   ) |
        zenity --progress \
        --title="Syncing..." \
        --text="Syncing with time server...\nPlease wait a while..." \
        --pulsate
-  sudo /etc/init.d/ntpd start
+  test -e /etc/init.d/ntpd && sudo /etc/init.d/ntpd start
+  if $screensaver_enabled; then
+    xset s on
+  fi
   ;;
 esac
 done