From 90b0e2e8ab85b6c7433ae89ff16384290e05f1cb Mon Sep 17 00:00:00 2001 From: Peter Vicman Date: Thu, 21 Jul 2016 17:32:20 +0200 Subject: [PATCH] sundtek-mediatv: update driver to latest version on first install show driver version in addon settings allow update for aarch64 architecture german translations --- .../driver/sundtek-mediatv/changelog.txt | 6 ++++ .../addons/driver/sundtek-mediatv/package.mk | 4 +-- .../source/bin/sundtek-mediatv.start | 15 +++++++- .../source/bin/sundtek-update-driver.sh | 12 +++++-- .../resources/language/English/strings.xml | 5 +-- .../resources/language/German/strings.xml | 35 +++++++++++++++++++ .../source/resources/settings.xml | 1 + 7 files changed, 70 insertions(+), 8 deletions(-) mode change 100644 => 100755 packages/addons/driver/sundtek-mediatv/changelog.txt create mode 100644 packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt old mode 100644 new mode 100755 index 2fd4cac827..3eb6749321 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,9 @@ +8.0.102 +- automatically update driver to latest version on first install + show driver version in addon settings + allow update for aarch64 architecture + german translations + 8.0.101 - system wait-for-online preference is now respected diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 1d725be548..f85919b78f 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -18,7 +18,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="7.0" -PKG_REV="101" +PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" @@ -27,7 +27,7 @@ PKG_DEPENDS_TARGET="" PKG_PRIORITY="optional" PKG_SECTION="driver/dvb" PKG_SHORTDESC="Sundtek MediaTV: a Linux driver to add support for SUNDTEK USB DVB devices" -PKG_LONGDESC="Install this to add support for SundTek USB DVB devices." +PKG_LONGDESC="Install this to add support for Sundtek USB DVB devices." PKG_IS_ADDON="yes" PKG_ADDON_NAME="Sundtek MediaTV" diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start index 3e343ef6d9..db51011b40 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start @@ -36,8 +36,17 @@ SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml" mkdir -p $SUNDTEK_ADDON_HOME +# remove the entry +BUILD_DATE="#" +sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml + if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/ + + # update driver on first run + echo "update driver" >/tmp/ppp + systemd-run $SUNDTEK_ADDON_DIR/bin/sundtek-update-driver.sh + exit 0 # will be started later else # in case of missing entries in addon home's sundtek.conf entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)" @@ -244,4 +253,8 @@ if [ -z "$(pidof mediasrv)" ]; then fi fi -logger -t Sundtek "### Sundtek ready ###" +# change build date in addon settings +BUILD_DATE=$(mediasrv --build 2>&1) +sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml + +logger -t Sundtek "### Sundtek ready ($BUILD_DATE) ###" diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh index 0131a8d1f7..3e5339f292 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh @@ -36,6 +36,10 @@ systemctl stop driver.dvb.sundtek-mediatv killall -9 mediaclient &>/dev/null killall -9 mediasrv &>/dev/null +# remove the entry +BUILD_DATE="#" +sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml + # exit on errors set -e @@ -47,7 +51,7 @@ mkdir tmp cd tmp logger -t Sundtek "### Starting updating driver ###" -kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)" +kodi-send -a "Notification(Sundtek, Starting updating driver, 3000, $SUNDTEK_ADDON_DIR/icon.png)" wget -O ../version.used http://sundtek.de/media/latest.phtml if [ $? -ne 0 ]; then @@ -63,6 +67,8 @@ if [ "$ARCH" = "x86_64" ]; then INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz" elif [ "$ARCH" = "arm" ]; then INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz" +elif [ "$ARCH" = "aarch64" ]; then + INSTALLER_URL="http://sundtek.de/media/netinst/arm64/installer.tar.gz" else logger -t Sundtek "### Unsupported architecture ###" kodi-send -a "Notification(Sundtek, Unsupported architecture, 8000, $SUNDTEK_ADDON_DIR/icon.png)" @@ -72,7 +78,7 @@ else fi logger -t Sundtek "### Downloading driver archive for $ARCH ###" -kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000, $SUNDTEK_ADDON_DIR/icon.png)" +kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 3000, $SUNDTEK_ADDON_DIR/icon.png)" wget -O installer.tar.gz $INSTALLER_URL if [ $? -ne 0 ]; then logger -t Sundtek "### Archive damaged ###" @@ -83,7 +89,7 @@ if [ $? -ne 0 ]; then fi logger -t Sundtek "### Extracting archive ###" -kodi-send -a "Notification(Sundtek, Extracting archive, 2000, $SUNDTEK_ADDON_DIR/icon.png)" +kodi-send -a "Notification(Sundtek, Extracting archive, 3000, $SUNDTEK_ADDON_DIR/icon.png)" tar -xzf installer.tar.gz if [ $? -ne 0 ]; then logger -t Sundtek "### Archive damaged ###" diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml index a00afae1ea..91a3520982 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml @@ -24,11 +24,12 @@ Tuner settings Enable modifying settings - Refresh tuners... (press me) + >> Refresh tuners <<< ]]> IR protocol keymap filename Driver + Driver version Check for new driver version at boot - Update from web... (press me) + >> Update driver now <<< ]]> diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml new file mode 100644 index 0000000000..8ff6337d81 --- /dev/null +++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml @@ -0,0 +1,35 @@ + + + Allgemein + Verzögerung bevor Treiber gestartet wird [Sek.] + Skript welches vom Treiber-Stack gestartet werden soll + Hardware PID Filter einschalten + Fernbedienung unterstützen + Niedrigste Adapter Nummer (/dev/dvb/adapterX/) + Suspend / Resume des Treibers zulassen + + Netzwerksupport + Netzwerkserver aktivieren + Mit Netzwerk-Tunern verbinden + Server 1 IP Adresse + # Tuner ID + Server 2 IP Adresse + # Tuner ID + Server 3 IP Adresse + # Tuner ID + Server 4 IP Adresse + # Tuner ID + Server 5 IP Adresse + # Tuner ID + + Geräte Einstellungen + Geräte-Einstellung ändern + >> Tuner-Liste aktualisieren <<< ]]> + IR Protokoll + Keymap Datei + + Treiber + Treiber-Version + Bei Neustart auf neue Treiber-Version prüfen + >> Treiber jetzt aktualisieren <<< ]]> + diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml index 31535caf84..34183f09a8 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml @@ -31,6 +31,7 @@ +