summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xabs/core-testing/linhes-scripts/770-wrapper.sh2
-rw-r--r--abs/core-testing/linhes-scripts/PKGBUILD2
-rw-r--r--abs/core-testing/linhes-scripts/linhes_update.sh4
-rw-r--r--abs/core-testing/linhes-scripts/linhes_update2.sh2
-rw-r--r--abs/core-testing/linhes-scripts/linhes_update3.sh6
5 files changed, 11 insertions, 5 deletions
diff --git a/abs/core-testing/linhes-scripts/770-wrapper.sh b/abs/core-testing/linhes-scripts/770-wrapper.sh
index 65573f4..3095541 100755
--- a/abs/core-testing/linhes-scripts/770-wrapper.sh
+++ b/abs/core-testing/linhes-scripts/770-wrapper.sh
@@ -26,7 +26,7 @@ fi
# Transcode the file
-perl /usr/local/bin/770-encode.pl -q -p mplayer $VIDEODIR/$FILENAME $DIROUT/$TITLE-$STARTTIME.avi
+perl /usr/bin/tablet-encode -q -p mplayer $VIDEODIR/$FILENAME $DIROUT/$TITLE-$STARTTIME.avi
chmod 664 $DIROUT/$TITLE-$STARTTIME.avi
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 086e08a..7dc200b 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=38
+pkgrel=39
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 3b455e0..39b341e 100644
--- a/abs/core-testing/linhes-scripts/linhes_update.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update.sh
@@ -11,8 +11,8 @@ dsply () {
}
chck () {
sudo pacman -Sy
- sudo pacman -Qu > /tmp/check_update
- sudo grep Target /tmp/check_update > /tmp/to_be_upgraded
+ sudo pacman -Qu > /tmp/to_be_upgraded
+# sudo grep Target /tmp/check_update > /tmp/to_be_upgraded
if grep -q no\ upgrades\ found /tmp/check_update
then
killall osd_cat
diff --git a/abs/core-testing/linhes-scripts/linhes_update2.sh b/abs/core-testing/linhes-scripts/linhes_update2.sh
index 20f32b9..e6d216d 100644
--- a/abs/core-testing/linhes-scripts/linhes_update2.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update2.sh
@@ -1,6 +1,6 @@
#!/bin/bash
echo -e "Performing updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 300000 -A centre &
-sudo pacman -Syuf --noconfirm && sudo killall -9 osd_cat
+sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
if grep -q Check\ for\ updates /usr/share/mythtv/linhes.xml
then
rm -fr /tmp/to_be_upgraded
diff --git a/abs/core-testing/linhes-scripts/linhes_update3.sh b/abs/core-testing/linhes-scripts/linhes_update3.sh
index 56e8612..e89f7a3 100644
--- a/abs/core-testing/linhes-scripts/linhes_update3.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update3.sh
@@ -8,3 +8,9 @@ if [ $COUNT -lt 20 ]
else
cat /tmp/to_be_upgraded2 | osd_cat -p top -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 1 -A centre -l 20 -w
fi
+if grep kernel26 /tmp/to_be_upgraded2
+then
+ 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
+fi