data/control: remove some hardcoded paths

Origin commit data
------------------
Branch: ni/coolstream
Commit: bcf9e0b22d
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-24 (Tue, 24 Nov 2020)

Origin message was:
------------------
- data/control: remove some hardcoded paths

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-11-24 00:10:45 +01:00
parent ed2ce51fc8
commit 4e5f83bbd8
3 changed files with 21 additions and 13 deletions

View File

@@ -473,6 +473,11 @@ AC_CONFIG_FILES([
src/nhttpd/nhttpd.conf src/nhttpd/nhttpd.conf
]) ])
# Migration script
AC_CONFIG_FILES([
data/control/migration.sh
])
# Backup configs # Backup configs
AC_CONFIG_FILES([ AC_CONFIG_FILES([
data/config/settingsupdate.conf data/config/settingsupdate.conf

View File

@@ -1,3 +1,6 @@
EXTRA_DIST = \
migration.sh migration.sh.in
installdir = $(CONTROLDIR) installdir = $(CONTROLDIR)
install_SCRIPTS = \ install_SCRIPTS = \

View File

@@ -1,22 +1,22 @@
#!/bin/sh #!/bin/sh
cd /var/tuxbox/config cd @CONFIGDIR@
if [ -e neutrino.conf ]; then if [ -e neutrino.conf ]; then
# remove NG leftovers # remove NG leftovers
sed -i 's|ng_netfs_\(.*\)|netfs_\1|' neutrino.conf sed -i 's|ng_netfs_\(.*\)|netfs_\1|' neutrino.conf
# webradio_usr.xml was moved # webradio_usr.xml was moved
sed -i "s|/var/tuxbox/config/webradio_usr.xml|/var/tuxbox/webradio/webradio_usr.xml|" neutrino.conf sed -i "s|@CONFIGDIR@/webradio_usr.xml|@WEBRADIODIR_VAR@/webradio_usr.xml|" neutrino.conf
mkdir -p /var/tuxbox/webradio/ mkdir -p @WEBRADIODIR_VAR@/
if [ -e /var/tuxbox/config/webradio_usr.xml ]; then if [ -e @CONFIGDIR@/webradio_usr.xml ]; then
mv /var/tuxbox/config/webradio_usr.xml /var/tuxbox/webradio/ mv @CONFIGDIR@/webradio_usr.xml @WEBRADIODIR_VAR@/
fi fi
# webtv_usr.xml was moved # webtv_usr.xml was moved
sed -i "s|/var/tuxbox/config/webtv_usr.xml|/var/tuxbox/webtv/webtv_usr.xml|" neutrino.conf sed -i "s|@CONFIGDIR@/webtv_usr.xml|@WEBTVDIR_VAR@/webtv_usr.xml|" neutrino.conf
mkdir -p /var/tuxbox/webtv/ mkdir -p @WEBTVDIR_VAR@/
if [ -e /var/tuxbox/config/webtv_usr.xml ]; then if [ -e @CONFIGDIR@/webtv_usr.xml ]; then
mv /var/tuxbox/config/webtv_usr.xml /var/tuxbox/webtv/ mv @CONFIGDIR@/webtv_usr.xml @WEBTVDIR_VAR@/
fi fi
# remove all old glcd_ keywords; neutrino will add the new ones # remove all old glcd_ keywords; neutrino will add the new ones
@@ -30,7 +30,7 @@ fi
if [ -e zapit/frontend.conf ]; then if [ -e zapit/frontend.conf ]; then
# uni_qrg was renamed to uni_freq # uni_qrg was renamed to uni_freq
sed -i "s|_uni_qrg=|_uni_freq=|g" /var/tuxbox/config/zapit/frontend.conf sed -i "s|_uni_qrg=|_uni_freq=|g" @CONFIGDIR@/zapit/frontend.conf
fi fi
controlscripts="\ controlscripts="\
@@ -53,13 +53,13 @@ controlscripts="\
standby.off \ standby.off \
" "
mkdir -p /var/tuxbox/control/ mkdir -p @CONTROLDIR_VAR@/
for controlscript in $controlscripts; do for controlscript in $controlscripts; do
if [ -e $controlscript ]; then if [ -e $controlscript ]; then
mv $controlscript /var/tuxbox/control/ mv $controlscript @CONTROLDIR_VAR@/
fi fi
done done
# these control scripts hasn't counterparts in /var # these control scripts hasn't counterparts in @CONTROLDIR_VAR@
rm -f migration.sh rm -f migration.sh
rm -f flash.start rm -f flash.start