op_osupgrade: use terminal for logs

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 2abd3d9a14b22be96bd41debd90ba23add0c68ea..04ddacd7a55b43f3ae5e80e8a4d3066c60e20fad 100644 (file)
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r120"
+PR = "r121"
 
 SRC_URI = " \
           file://op_paths.sh \

diff --git a/recipes/pandora-system/pandora-scripts/op_osupgrade.sh b/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
index af57350ffc9827389120c980efe3cc5f23410571..04199e7945a4c9aadde7fc9b5ca31cfaf76c1d7f 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
+++ b/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
@@ -1,5 +1,18 @@
-#!/bin/bash
+#!/bin/sh
 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"
-opkg update 2>&1 | tee /tmp/upgrade.log | zenity --progress --auto-close --pulsate --title "Updating feedlist..."
-opkg upgrade 2>&1 | tee -a /tmp/upgrade.log | zenity --text-info --title "Updating packages..." --width=600
-zenity --info --title="Upgrade complete" --text "All operations have been finished.\n\nYou can find a logfile in /tmp/upgrade.log"
\ No newline at end of file
+
+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'
+
+if test -e /tmp/upgrade_ok; then
+  zenity --info --title="Upgrade complete" \
+    --text "All operations have been finished.\n\nYou can find a logfile at /tmp/upgrade.log"
+else
+  zenity --error --title="Errors detected" \
+    --text "Errors detected during update.\n\nYou can find a logfile at /tmp/upgrade.log"
+fi
+rm -f /tmp/upgrade_ok