pandora-scripts: some tweaks

[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
index 973518a..fa0a837 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
+++ b/recipes/pandora-system/pandora-scripts/op_osupgrade.sh
@@ -2,7 +2,16 @@
 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
+get_version()
+{
+  ver=`grep "Display Ver:" /etc/op-version | awk -F': ' '{print $2}' 2> /dev/null`
+  if [ -n "$ver" ]; then
+    echo "Current OS version:\n$ver"
+  fi
+}
+
+ver=`get_version`
+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$ver" --ok-label="Upgrade OS" --cancel-label="Quit" || exit 0
 
 # check free space
 root_free=`df | grep '/$' | sed -e '2~1d' | awk '{print $4}'`
@@ -18,7 +27,7 @@ fi
 # check for default angstrom feeds
 if cat /etc/opkg/*.conf | awk -F# '{printf $1}' | grep -q www.angstrom-distribution.org; then
   zenity --error --text "There seem to be Angstrom feeds in your opkg configs, \
-upgraging from them is known to make the system unbootable.
+upgrading from them is known to make the system unbootable.
 Aborting."
   exit 1
 fi
@@ -36,8 +45,9 @@ kernelmd5_new=`md5sum $kernel_path`
 
 if test -e /tmp/upgrade_ok; then
   rm -f /tmp/upgrade_ok
+  ver=`get_version`
   zenity --info --title="Upgrade complete" \
-    --text "All operations have been finished.\n\nYou can find a log file at /tmp/upgrade.log"
+    --text "All operations have been finished.\n\nYou can find a log file at /tmp/upgrade.log\n\n$ver"
   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?" \