mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 07:51:11 +02:00
scripts: move migration script away from control scripts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58f91648c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-26 (Sun, 26 Sep 2021)
Origin message was:
------------------
- scripts: move migration script away from control scripts
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1,6 +1,3 @@
|
|||||||
EXTRA_DIST = \
|
|
||||||
migration.sh migration.sh.in
|
|
||||||
|
|
||||||
installdir = $(CONTROLDIR)
|
installdir = $(CONTROLDIR)
|
||||||
|
|
||||||
install_SCRIPTS = \
|
install_SCRIPTS = \
|
||||||
@@ -9,7 +6,6 @@ install_SCRIPTS = \
|
|||||||
deepstandby.on \
|
deepstandby.on \
|
||||||
deepstandby.off \
|
deepstandby.off \
|
||||||
inactivity.on \
|
inactivity.on \
|
||||||
migration.sh \
|
|
||||||
movieplayer.start \
|
movieplayer.start \
|
||||||
movieplayer.end \
|
movieplayer.end \
|
||||||
neutrino.start \
|
neutrino.start \
|
||||||
|
@@ -2,13 +2,15 @@ EXTRA_DIST = \
|
|||||||
backup.sh backup.sh.in \
|
backup.sh backup.sh.in \
|
||||||
restore.sh restore.sh.in \
|
restore.sh restore.sh.in \
|
||||||
backup_flash.sh backup_flash.sh.in \
|
backup_flash.sh backup_flash.sh.in \
|
||||||
restore_flash.sh restore_flash.sh.in
|
restore_flash.sh restore_flash.sh.in \
|
||||||
|
migration.sh migration.sh.in
|
||||||
|
|
||||||
installdir = $(bindir)
|
installdir = $(bindir)
|
||||||
|
|
||||||
install_SCRIPTS = \
|
install_SCRIPTS = \
|
||||||
backup.sh \
|
backup.sh \
|
||||||
restore.sh \
|
restore.sh \
|
||||||
|
migration.sh \
|
||||||
wakeup.sh \
|
wakeup.sh \
|
||||||
install.sh
|
install.sh
|
||||||
|
|
||||||
|
@@ -60,6 +60,5 @@ for controlscript in $controlscripts; do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# 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
|
@@ -46,9 +46,6 @@
|
|||||||
#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT "deepstandby.off"
|
#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT "deepstandby.off"
|
||||||
#define NEUTRINO_APP_START_SCRIPT "neutrino.start"
|
#define NEUTRINO_APP_START_SCRIPT "neutrino.start"
|
||||||
|
|
||||||
// control scripts w/o counterparts in /var
|
|
||||||
#define NEUTRINO_CONF_MIGRATION_SCRIPT CONTROLDIR "/migration.sh"
|
|
||||||
|
|
||||||
#define COVERDIR_TMP "/tmp/.cover"
|
#define COVERDIR_TMP "/tmp/.cover"
|
||||||
#define LOGODIR_TMP "/tmp/.logo"
|
#define LOGODIR_TMP "/tmp/.logo"
|
||||||
|
|
||||||
|
@@ -365,7 +365,9 @@ int CNeutrinoApp::loadSetup(const char *fname)
|
|||||||
int erg = 0;
|
int erg = 0;
|
||||||
|
|
||||||
// execute migration script before loading configfile
|
// execute migration script before loading configfile
|
||||||
my_system(NEUTRINO_CONF_MIGRATION_SCRIPT);
|
std::string migration_sh = find_executable("migration.sh");
|
||||||
|
if (!migration_sh.empty())
|
||||||
|
my_system(migration_sh.c_str());
|
||||||
|
|
||||||
configfile.clear();
|
configfile.clear();
|
||||||
// load settings; setup defaults
|
// load settings; setup defaults
|
||||||
|
Reference in New Issue
Block a user