pandora-scripts: improve op_osupgrade

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

diff --git a/recipes/pandora-system/pandora-scripts/op_osupgrade.sh b/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
old mode 100644 (file)
new mode 100755 (executable)
index 14cc71f..973518a
--- a/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
+++ b/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+work_script_path="/usr/pandora/scripts/op_osupgrade_work.sh"
 kernel_path="/boot/uImage-3"
 
 zenity --question --title="Update Firmware OS" --text="This little tool helps you to keep your firmware OS up-to-date with the latest tweaks.\n\nPlease note that this is in TESTING state and\nmight break parts of your system with unstable packages!\n\nMake sure your Pandora is connected to the internet and click the Upgrade-Button.\n\n" --ok-label="Upgrade OS" --cancel-label="Quit" || exit 0
@@ -22,23 +23,21 @@ Aborting."
   exit 1
 fi
 
+rm -f /tmp/upgrade_ok /tmp/upgrade_script_updated
 kernelmd5_old=`md5sum $kernel_path`
 
+# reminder: don't use '&&' '||' ... after tee, it breaks set -e, no idea why
 terminal -x bash -c \
-  'echo "Updating package lists..." && \
-   opkg update 2>&1 | tee /tmp/upgrade.log && test ${PIPESTATUS[0]} -eq 0 && \
-   echo "Checking for updated packages..." && \
-   opkg upgrade 2>&1 | tee -a /tmp/upgrade.log && test ${PIPESTATUS[0]} -eq 0 && \
-   touch /tmp/upgrade_ok || sleep 3'
-
-sync
+  "( $work_script_path || ( echo && echo "Retrying.." && $work_script_path ) ) 2>&1 \
+       | tee /tmp/upgrade.log; \
+   test -e /tmp/upgrade_ok || sleep 3"
 
 kernelmd5_new=`md5sum $kernel_path`
 
 if test -e /tmp/upgrade_ok; then
   rm -f /tmp/upgrade_ok
   zenity --info --title="Upgrade complete" \
-    --text "All operations have been finished.\n\nYou can find a logfile at /tmp/upgrade.log"
+    --text "All operations have been finished.\n\nYou can find a log file at /tmp/upgrade.log"
   if [ "$kernelmd5_old" != "$kernelmd5_new" ]; then
     zenity --question --title="Kernel updated" \
       --text "The kernel has been updated,\nreboot is needed to start it.\n\nReboot now?" \
@@ -47,5 +46,9 @@ if test -e /tmp/upgrade_ok; then
   fi
 else
   zenity --error --title="Errors detected" \
-    --text "Errors detected during update.\n\nYou can find a logfile at /tmp/upgrade.log"
+    --text "Errors detected during update. Please check your Internet connection and try again.
+
+If long update process was interrupted, it is recommended to run the update again before a reboot.
+
+You can find a log file at /tmp/upgrade.log"
 fi