From a48d9dc626851b49b74977dfd6721331bb9677f5 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 23 Dec 2017 15:58:00 +0100 Subject: [PATCH] .version: fix path to .version in some relevant files --- src/gui/network_setup.cpp | 2 +- src/gui/update.cpp | 4 ++-- src/nhttpd/tuxboxapi/controlapi.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 2da85e62f..162afa922 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -710,7 +710,7 @@ void CNetworkSetup::testNetworkSettings() //get www-domain testsite from /.version CConfigFile config('\t'); - config.loadConfig(TARGET_PREFIX "/.version"); + config.loadConfig("/.version"); testsite = config.getString("homepage",defaultsite); testsite.replace( 0, testsite.find("www",0), "" ); diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 9647dfd84..e15572cee 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -146,7 +146,7 @@ bool CFlashUpdate::checkOnlineVersion() std::vector update_t_list; CConfigFile _configfile('\t'); - const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; + const char * versionString = (_configfile.loadConfig( "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; #ifdef DEBUG printf("[update] file %s\n", g_settings.softupdate_url_file.c_str()); #endif @@ -203,7 +203,7 @@ bool CFlashUpdate::selectHttpImage(void) CConfigFile _configfile('\t'); std::string versionString = "????????????????"; - if (_configfile.loadConfig(TARGET_PREFIX "/.version")) + if (_configfile.loadConfig("/.version")) versionString = _configfile.getString("version", "????????????????"); CFlashVersionInfo curInfo(versionString.c_str()); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index b8f3cc973..419654e38 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -822,7 +822,7 @@ void CControlAPI::InfoCGI(CyhookHandler *hh) if (hh->ParamList["1"] == "streaminfo") // print streaminfo SendStreamInfo(hh); else if (hh->ParamList["1"] == "version") // send version file - hh->SendFile(TARGET_PREFIX "/.version"); + hh->SendFile("/.version"); else if (hh->ParamList["1"] == "httpdversion") // print httpd version typ (just for compatibility) hh->Write("3"); else if (hh->ParamList["1"] == "nhttpd_version")// print nhttpd version @@ -2052,7 +2052,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh) //----------------------------------------------------------------------------- void CControlAPI::VersionCGI(CyhookHandler *hh) { - hh->SendFile(TARGET_PREFIX "/.version"); + hh->SendFile("/.version"); } //----------------------------------------------------------------------------- void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)