Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

5 files changed, 38 insertions, 51 deletions

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index f0ca1a6..e8aebcc 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=10
+pkgrel=11
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -79,7 +79,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'b2c3dd48a4abb976eda2d5fbf22a173a'
          'b527b01d119d3bc33b8fa69bdf1082bb'
          'f691c2bdf5da5455c9a5c2ab0ee1f820'
-         '253d5c9249fbf4641dbf82368efac7cb'
+         'a2786dd6fb70332c9f2f6d1737e7ac44'
          '460861e6d0cf999629b734912eea0acf'
          'ccca6bdbbd86b203a3eecdbbe363e701'
          '65629302a4d2c3adf88cdf0ebc10d493'
diff --git a/abs/core/linhes-scripts/linhes_update2.sh b/abs/core/linhes-scripts/linhes_update2.sh
index 78a0519..a48a996 100644
--- a/abs/core/linhes-scripts/linhes_update2.sh
+++ b/abs/core/linhes-scripts/linhes_update2.sh
@@ -11,33 +11,37 @@
 }
 #----------------------------------------------------------------------------
 
-killall -9 osd_cat
-echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & 
-echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & 
-sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
-if grep -q Check\ for\ updates /usr/share/mythtv/themes/defaultmenu/linhes.xml
+if [[ "$1" = "install" ]]
 then
-rm -fr /tmp/to_be_upgraded
-killall -9 osd_cat
-echo -e "\nUpdate complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-echo -e "\nUpdate complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+	killall -9 osd_cat
+	echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & 
+	echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+	sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
+	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 &
 else
-mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
-sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
-mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
-grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
-echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
-echo "   <button>" >> /tmp/linhes.xml.tmp
-echo "     <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
-echo "     <text>Update LinHES</text>" >> /tmp/linhes.xml.tmp
-echo "     <action>MENU update.xml</action>" >> /tmp/linhes.xml.tmp
-echo "   </button>" >> /tmp/linhes.xml.tmp
-echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
-echo "" >> /tmp/linhes.xml.tmp
-echo "</mythmenu>" >> /tmp/linhes.xml.tmp
-mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
+	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 &
+	echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+fi
+
 rm -fr /tmp/to_be_upgraded
-killall -9 osd_cat
-echo -e "\nUpdate complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-echo -e "\nUpdate complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+
+if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
+then
+	mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
+	sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
+	mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
+	grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
+	echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
+	echo "   <button>" >> /tmp/linhes.xml.tmp
+	echo "     <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
+	echo "     <text>Update LinHES</text>" >> /tmp/linhes.xml.tmp
+	echo "     <action>MENU update.xml</action>" >> /tmp/linhes.xml.tmp
+	echo "   </button>" >> /tmp/linhes.xml.tmp
+	echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
+	echo "" >> /tmp/linhes.xml.tmp
+	echo "</mythmenu>" >> /tmp/linhes.xml.tmp
+	mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
 fi
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
index b79cb66..cf504eb 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.24
-pkgrel=23
+pkgrel=24
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
index 5b28833..d2ac3fe 100644
--- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
@@ -2,19 +2,8 @@
 
    <button>
      <type>UPGRADE</type>
-     <text>Check for updates?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>UPGRADE</type>
-     <text>Yes</text>
+     <text>Check for Updates</text>
      <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
    </button>
-   
-   <button>
-     <type>UPGRADE</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
+
 </mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
index e4a443d..64388cb 100644
--- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
@@ -2,21 +2,15 @@
 
    <button>
      <type>UPGRADE</type>
-     <text>Install Updates?</text>
-     <action>NONE</action>
+     <text>Install Updates</text>
+     <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
    </button>
 
    <button>
      <type>UPGRADE</type>
-     <text>Yes</text>
+     <text>Cancel Updates</text>
      <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
    </button>
-   
-   <button>
-     <type>UPGRADE</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
 
    <button>
      <type>UPGRADE</type>