summaryrefslogtreecommitdiffstats
path: root/abs/core/linhes-scripts
diff options
context:
space:
mode:
authorMichael Hanson <mihanson@linhes.org>2012-02-20 21:32:43 (GMT)
committerMichael Hanson <mihanson@linhes.org>2012-02-20 21:32:43 (GMT)
commit30c420f9bf1a561d360abb83ef9226583e7c5b58 (patch)
treec861adc3fb699d8acb366b686cde52d28c40f759 /abs/core/linhes-scripts
parente70a067f9eab0330e559b3d03c97cca3e02cd4ae (diff)
parent21c364279485a642183b45c081c3936ba6230953 (diff)
downloadlinhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.zip
linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.gz
linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.bz2
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/linhes-scripts')
-rw-r--r--abs/core/linhes-scripts/PKGBUILD6
-rw-r--r--abs/core/linhes-scripts/linhes_update.sh2
-rw-r--r--abs/core/linhes-scripts/linhes_update2.sh5
3 files changed, 9 insertions, 4 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index eda3653..a50faf8 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=25
+pkgrel=27
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -84,8 +84,8 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
'25dd5b8ec0482d561b481bfce051d648'
'b2c3dd48a4abb976eda2d5fbf22a173a'
'b527b01d119d3bc33b8fa69bdf1082bb'
- 'f691c2bdf5da5455c9a5c2ab0ee1f820'
- 'a2786dd6fb70332c9f2f6d1737e7ac44'
+ '9d077c24d102fa02e4f417d639d8b00a'
+ '98979920c30bb48c02d00f6943e9e50e'
'460861e6d0cf999629b734912eea0acf'
'ccca6bdbbd86b203a3eecdbbe363e701'
'65629302a4d2c3adf88cdf0ebc10d493'
diff --git a/abs/core/linhes-scripts/linhes_update.sh b/abs/core/linhes-scripts/linhes_update.sh
index a307146..e5dd2ad 100644
--- a/abs/core/linhes-scripts/linhes_update.sh
+++ b/abs/core/linhes-scripts/linhes_update.sh
@@ -47,7 +47,7 @@ chck () {
mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp
- if grep kernel26 /tmp/to_be_upgraded
+ if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
then
echo "" >> /tmp/update3.xml.tmp
echo " <button>" >> /tmp/update3.xml.tmp
diff --git a/abs/core/linhes-scripts/linhes_update2.sh b/abs/core/linhes-scripts/linhes_update2.sh
index a48a996..d6984ed 100644
--- a/abs/core/linhes-scripts/linhes_update2.sh
+++ b/abs/core/linhes-scripts/linhes_update2.sh
@@ -20,6 +20,11 @@ then
killall -9 osd_cat
echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+ then
+ echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ fi
else
killall -9 osd_cat
echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &