From 4e5f83bbd850b35a747a3744716f1846ac26b20f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 24 Nov 2020 00:10:45 +0100 Subject: [PATCH] data/control: remove some hardcoded paths Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bcf9e0b22d39825ddfabab16a3bb34e491ffa40a Author: vanhofen 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 --- configure.ac | 5 ++++ data/control/Makefile.am | 3 +++ .../control/{migration.sh => migration.sh.in} | 26 +++++++++---------- 3 files changed, 21 insertions(+), 13 deletions(-) rename data/control/{migration.sh => migration.sh.in} (57%) diff --git a/configure.ac b/configure.ac index 8f04082ce..fb59c35aa 100644 --- a/configure.ac +++ b/configure.ac @@ -473,6 +473,11 @@ AC_CONFIG_FILES([ src/nhttpd/nhttpd.conf ]) +# Migration script +AC_CONFIG_FILES([ +data/control/migration.sh +]) + # Backup configs AC_CONFIG_FILES([ data/config/settingsupdate.conf diff --git a/data/control/Makefile.am b/data/control/Makefile.am index c01669965..d21ed933a 100644 --- a/data/control/Makefile.am +++ b/data/control/Makefile.am @@ -1,3 +1,6 @@ +EXTRA_DIST = \ + migration.sh migration.sh.in + installdir = $(CONTROLDIR) install_SCRIPTS = \ diff --git a/data/control/migration.sh b/data/control/migration.sh.in similarity index 57% rename from data/control/migration.sh rename to data/control/migration.sh.in index 20fe6891c..3f546f266 100644 --- a/data/control/migration.sh +++ b/data/control/migration.sh.in @@ -1,22 +1,22 @@ #!/bin/sh -cd /var/tuxbox/config +cd @CONFIGDIR@ if [ -e neutrino.conf ]; then # remove NG leftovers sed -i 's|ng_netfs_\(.*\)|netfs_\1|' neutrino.conf # webradio_usr.xml was moved - sed -i "s|/var/tuxbox/config/webradio_usr.xml|/var/tuxbox/webradio/webradio_usr.xml|" neutrino.conf - mkdir -p /var/tuxbox/webradio/ - if [ -e /var/tuxbox/config/webradio_usr.xml ]; then - mv /var/tuxbox/config/webradio_usr.xml /var/tuxbox/webradio/ + sed -i "s|@CONFIGDIR@/webradio_usr.xml|@WEBRADIODIR_VAR@/webradio_usr.xml|" neutrino.conf + mkdir -p @WEBRADIODIR_VAR@/ + if [ -e @CONFIGDIR@/webradio_usr.xml ]; then + mv @CONFIGDIR@/webradio_usr.xml @WEBRADIODIR_VAR@/ fi # webtv_usr.xml was moved - sed -i "s|/var/tuxbox/config/webtv_usr.xml|/var/tuxbox/webtv/webtv_usr.xml|" neutrino.conf - mkdir -p /var/tuxbox/webtv/ - if [ -e /var/tuxbox/config/webtv_usr.xml ]; then - mv /var/tuxbox/config/webtv_usr.xml /var/tuxbox/webtv/ + sed -i "s|@CONFIGDIR@/webtv_usr.xml|@WEBTVDIR_VAR@/webtv_usr.xml|" neutrino.conf + mkdir -p @WEBTVDIR_VAR@/ + if [ -e @CONFIGDIR@/webtv_usr.xml ]; then + mv @CONFIGDIR@/webtv_usr.xml @WEBTVDIR_VAR@/ fi # remove all old glcd_ keywords; neutrino will add the new ones @@ -30,7 +30,7 @@ fi if [ -e zapit/frontend.conf ]; then # 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 controlscripts="\ @@ -53,13 +53,13 @@ controlscripts="\ standby.off \ " -mkdir -p /var/tuxbox/control/ +mkdir -p @CONTROLDIR_VAR@/ for controlscript in $controlscripts; do if [ -e $controlscript ]; then - mv $controlscript /var/tuxbox/control/ + mv $controlscript @CONTROLDIR_VAR@/ fi done -# these control scripts hasn't counterparts in /var +# these control scripts hasn't counterparts in @CONTROLDIR_VAR@ rm -f migration.sh rm -f flash.start