From a98dca885e2e29a7462ae4b496a4bf0682f9e4c7 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 6 Jun 2013 21:19:29 +0300 Subject: [PATCH] sundtek-mediatv: change ADDON_* variable names having $ADDON_HOME replaced -n vdr / tvheadend after sourcing userspace.driver.sh is not what we want --- .../source/bin/userspace-driver.sh | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh index cc9c15ab28..6f27a90709 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh @@ -32,58 +32,58 @@ net_tuner_num_fix() { echo $num } -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv" -ADDON_SETTINGS="$ADDON_HOME/settings.xml" +SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" +SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv" +SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml" -mkdir -p $ADDON_HOME +mkdir -p $SUNDTEK_ADDON_HOME -if [ ! -f "$ADDON_HOME/sundtek.conf" ]; then - cp $ADDON_DIR/config/* $ADDON_HOME/ +if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then + cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/ else # in case of missing entries in addon home's sundtek.conf - entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)" + entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)" if [ -z "$entry_set" ]; then - sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf - sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf + sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf + sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf - sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $ADDON_HOME/sundtek.conf - sed -i 's|.*network_tuner_ip=.*||g' $ADDON_HOME/sundtek.conf + sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf + sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf fi fi -if [ ! -f "$ADDON_SETTINGS" ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS +if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then + cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS fi -[ ! -f $ADDON_HOME/rc_key_enter.map ] && mv $ADDON_HOME/rc_key_enter $ADDON_HOME/rc_key_enter.map -[ ! -f $ADDON_HOME/rc_key_ok.map ] && mv $ADDON_HOME/rc_key_ok $ADDON_HOME/rc_key_ok.map +[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map +[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map mkdir -p /var/config -cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf +cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf . /var/config/sundtek-addon.conf -if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then +if [ "$AUTO_UPDATE" = "true" -a -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then logger -t Sundtek "### Checking for new Sundtek binary installer ###" - touch $ADDON_HOME/driver-version.txt + touch $SUNDTEK_ADDON_HOME/driver-version.txt wget -O /tmp/sundtek-driver-version.txt http://sundtek.de/media/latest.phtml md5_1=$(md5sum -b /tmp/sundtek-driver-version.txt | awk '{print $1}') - md5_2=$(md5sum -b $ADDON_HOME/driver-version.txt | awk '{print $1}') + md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/driver-version.txt | awk '{print $1}') if [ "$md5_1" != "$md5_2" ]; then logger -t Sundtek "### Updating Sundtek binary installer ###" - rm -f $ADDON_DIR/bin/mediasrv + rm -f $SUNDTEK_ADDON_DIR/bin/mediasrv fi rm -f /tmp/sundtek-driver-version.txt fi -if [ ! -f $ADDON_DIR/bin/mediasrv ]; then +if [ ! -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then # remove renamed addon if exist rm -fr "$HOME/.xbmc/addons/driver.dvb.sundtek" rm -fr "$HOME/userdata/addon_data/driver.dvb.sundtek" logger -t Sundtek "### Downloading installer ###" - cd $ADDON_DIR + cd $SUNDTEK_ADDON_DIR mkdir -p bin lib tmp cd tmp/ @@ -96,10 +96,10 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz" # enable HW PID filter on RPi by default - sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf - sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf - sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $ADDON_DIR/settings-default.xml - sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $ADDON_SETTINGS + sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_DIR/config/sundtek.conf + sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_HOME/sundtek.conf + sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $SUNDTEK_ADDON_DIR/settings-default.xml + sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $SUNDTEK_ADDON_SETTINGS else logger -t Sundtek "### Unsupported architecture ###" cd .. @@ -120,17 +120,17 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then cp -Pa opt/bin/* ../bin/ cp -Pa opt/lib/* ../lib/ - cp ../driver-version.txt $ADDON_HOME/ + cp ../driver-version.txt $SUNDTEK_ADDON_HOME/ cd .. rm -fr tmp/ logger -t Sundtek "### Installer finished ###" - cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf + cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf . /var/config/sundtek-addon.conf fi -if [ ! -f $ADDON_HOME/driver-version.txt ]; then - cp $ADDON_DIR/driver-version.txt $ADDON_HOME/ +if [ ! -f $SUNDTEK_ADDON_HOME/driver-version.txt ]; then + cp $SUNDTEK_ADDON_DIR/driver-version.txt $SUNDTEK_ADDON_HOME/ fi # enable to install same addon package version again @@ -147,11 +147,11 @@ else sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile fi -export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so +export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so -if [ "$ANALOG_TV" = "true" -a ! -f "$ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then +if [ "$ANALOG_TV" = "true" -a ! -f "$SUNDTEK_ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then logger -t Sundtek "### Downloading missing ffmpeg libraries ###" - cd $ADDON_DIR/bin + cd $SUNDTEK_ADDON_DIR/bin mkdir -p plugins/ cd plugins/ @@ -174,7 +174,7 @@ if [ -z "$(pidof mediasrv)" ]; then rm -f /var/log/mediaclient.log SUNDTEK_CONF_TMP=/tmp/sundtek.conf - cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP + cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0 sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP @@ -298,13 +298,13 @@ if [ -z "$(pidof mediasrv)" ]; then fi md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}') - md5_2=$(md5sum -b $ADDON_HOME/sundtek.conf | awk '{print $1}') + md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}') if [ "$md5_1" != "$md5_2" ]; then # file changed - copy to addon home - cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf + cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf fi - mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d + mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d # wait few seconds [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0 @@ -320,18 +320,18 @@ if [ -z "$(pidof mediasrv)" ]; then mediaclient --disable-dvb=/dev/dvb/adapter0 fi - if [ "$RUN_USER_SCRIPT" = "true" -a -f "$ADDON_HOME/userscript.sh" ]; then - logger -t Sundtek "### Running user script $ADDON_HOME/userscript.sh ###" - cat $ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh + if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then + logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###" + cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh sh /var/run/sundtek-userscript.sh fi ( # save adapter serial number in background sleep 5 - serial_number_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null) + serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null) serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}') if [ "$serial_number_old" != "$serial_number_new" ]; then - echo "$serial_number_new" >$ADDON_HOME/adapters.txt + echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt fi )& fi