mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set correct path for /.version if TARGET_PREFIX is in use.

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 312a80bee9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-25 (Sun, 25 Sep 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-09-25 16:42:33 +02:00
parent 69092e211c
commit ee6fe6049f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/buildinfo.cpp
View File

@@ -145,7 +145,7 @@ bool CBuildInfo::HasData()
#if 0 #if 0
CConfigFile data ('\t'); CConfigFile data ('\t');
data.loadConfig("/.version"); data.loadConfig(TARGET_PREFIX "/.version");
build_info_t creator = {BI_TYPE_ID_CREATOR, LOCALE_BUILDINFO_CREATOR, data.getString("creator", "n/a")}; build_info_t creator = {BI_TYPE_ID_CREATOR, LOCALE_BUILDINFO_CREATOR, data.getString("creator", "n/a")};
v_info.push_back(creator); v_info.push_back(creator);
#endif #endif

2
src/gui/imageinfo.cpp
View File

@@ -67,7 +67,7 @@ void CImageInfo::Init(void)
license_txt = ""; license_txt = "";
v_info.clear(); v_info.clear();
config.loadConfig("/.version"); config.loadConfig(TARGET_PREFIX "/.version");
} }
CImageInfo::~CImageInfo() CImageInfo::~CImageInfo()

2
src/gui/network_setup.cpp
View File

@@ -725,7 +725,7 @@ void CNetworkSetup::testNetworkSettings()
//get www-domain testsite from /.version //get www-domain testsite from /.version
CConfigFile config('\t'); CConfigFile config('\t');
config.loadConfig("/.version"); config.loadConfig(TARGET_PREFIX "/.version");
testsite = config.getString("homepage",defaultsite); testsite = config.getString("homepage",defaultsite);
testsite.replace( 0, testsite.find("www",0), "" ); testsite.replace( 0, testsite.find("www",0), "" );

4
src/gui/update.cpp
View File

@@ -144,7 +144,7 @@ bool CFlashUpdate::checkOnlineVersion()
std::vector<CUpdateMenuTarget*> update_t_list; std::vector<CUpdateMenuTarget*> update_t_list;
CConfigFile _configfile('\t'); CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig("/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
#ifdef DEBUG #ifdef DEBUG
printf("[update] file %s\n", g_settings.softupdate_url_file.c_str()); printf("[update] file %s\n", g_settings.softupdate_url_file.c_str());
#endif #endif
@@ -200,7 +200,7 @@ bool CFlashUpdate::selectHttpImage(void)
int curVer, newVer, newfound = 0; int curVer, newVer, newfound = 0;
CConfigFile _configfile('\t'); CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig("/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
CFlashVersionInfo curInfo(versionString); CFlashVersionInfo curInfo(versionString);
printf("current flash-version: %s (%d) date %s (%ld)\n", versionString, curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime()); printf("current flash-version: %s (%d) date %s (%ld)\n", versionString, curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime());

4
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -752,7 +752,7 @@ void CControlAPI::InfoCGI(CyhookHandler *hh)
if (hh->ParamList["1"] == "streaminfo") // print streaminfo if (hh->ParamList["1"] == "streaminfo") // print streaminfo
SendStreamInfo(hh); SendStreamInfo(hh);
else if (hh->ParamList["1"] == "version") // send version file else if (hh->ParamList["1"] == "version") // send version file
hh->SendFile("/.version"); hh->SendFile(TARGET_PREFIX "/.version");
else if (hh->ParamList["1"] == "httpdversion") // print httpd version typ (only ffor comptibility) else if (hh->ParamList["1"] == "httpdversion") // print httpd version typ (only ffor comptibility)
hh->Write("3"); hh->Write("3");
else if (hh->ParamList["1"] == "nhttpd_version")// print nhttpd version else if (hh->ParamList["1"] == "nhttpd_version")// print nhttpd version
@@ -1934,7 +1934,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CControlAPI::VersionCGI(CyhookHandler *hh) void CControlAPI::VersionCGI(CyhookHandler *hh)
{ {
hh->SendFile("/.version"); hh->SendFile(TARGET_PREFIX "/.version");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh) void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)