From 19c8e78717c58404bf7feaff0ba6d756cdb92bc2 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 1 Jan 2010 11:33:16 -0800 Subject: linhes-scripts:updates upgrade scripts to ensure clean display of messages. --- abs/core-testing/linhes-scripts/PKGBUILD | 2 +- abs/core-testing/linhes-scripts/linhes_update.sh | 5 +++-- abs/core-testing/linhes-scripts/linhes_update2.sh | 3 +++ abs/core-testing/linhes-scripts/linhes_update3.sh | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD index fa5fe5a..60bdfb3 100644 --- a/abs/core-testing/linhes-scripts/PKGBUILD +++ b/abs/core-testing/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=1 -pkgrel=43 +pkgrel=44 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') diff --git a/abs/core-testing/linhes-scripts/linhes_update.sh b/abs/core-testing/linhes-scripts/linhes_update.sh index 8fdb665..39d2817 100644 --- a/abs/core-testing/linhes-scripts/linhes_update.sh +++ b/abs/core-testing/linhes-scripts/linhes_update.sh @@ -2,10 +2,11 @@ dsply () { if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml then - killall osd_cat + killall -9 osd_cat echo -e "Updates available!\n Exit and reenter Service Menu\n to perform updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 10 -A centre exit else + killall -9 osd_cat echo -e "Checking for updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 300 -A centre & fi } @@ -15,7 +16,7 @@ chck () { # sudo grep Target /tmp/check_update > /tmp/to_be_upgraded if grep -q no\ upgrades\ found /tmp/check_update then - killall osd_cat + killall -9 osd_cat echo -e "No updates available\n at this time." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre else mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp diff --git a/abs/core-testing/linhes-scripts/linhes_update2.sh b/abs/core-testing/linhes-scripts/linhes_update2.sh index 73bca24..80945eb 100644 --- a/abs/core-testing/linhes-scripts/linhes_update2.sh +++ b/abs/core-testing/linhes-scripts/linhes_update2.sh @@ -1,9 +1,11 @@ #!/bin/bash +killall -9 osd_cat echo -e "Performing updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 300000 -A centre & sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat if grep -q Check\ for\ updates /usr/share/mythtv/themes/defaultmenu/linhes.xml then rm -fr /tmp/to_be_upgraded +killall -9 osd_cat echo -e "Update complete." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre else mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp @@ -21,5 +23,6 @@ echo "" >> /tmp/linhes.xml.tmp echo "" >> /tmp/linhes.xml.tmp mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml rm -fr /tmp/to_be_upgraded +killall -9 osd_cat echo -e "Update complete." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre fi diff --git a/abs/core-testing/linhes-scripts/linhes_update3.sh b/abs/core-testing/linhes-scripts/linhes_update3.sh index e89f7a3..5dc0b4d 100644 --- a/abs/core-testing/linhes-scripts/linhes_update3.sh +++ b/abs/core-testing/linhes-scripts/linhes_update3.sh @@ -10,6 +10,7 @@ if [ $COUNT -lt 20 ] fi if grep kernel26 /tmp/to_be_upgraded2 then + killall -9 osd_cat echo -e "Please note:\The kernel will be upgraded.\nThis will require a reboot.\nPlease do so when no jobs are running." | osd_cat -p middle -s 5 -f"-adobe-courier-bould-*-*-*-34-*-*-*-*-*" -d 10 -A centre else exit -- cgit v0.12