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

- try to fix path to /.version file

Browse Source 
Conflicts:
	src/gui/imageinfo.cpp
	src/gui/network_setup.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-12-06 13:32:20 +01:00
committed by Thilo Graf
parent ea64294d6a
commit cf67ca4cb6
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.h
View File

@@ -29,6 +29,8 @@
#define NEUTRINO_CPP extern
#endif
#define IMAGE_VERSION_FILE "/.version"
#define NEUTRINO_SETTINGS_FILE CONFIGDIR "/neutrino.conf"
#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked"

2
src/gui/buildinfo.cpp
View File

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

6
src/gui/imageinfo.cpp
View File

@@ -54,8 +54,6 @@
#include <nhttpd/yconfig.h>
#include <ctype.h>
#define VERSION_FILE "/.version"
#define OS_RELEASE_FILE "/usr/lib/os-release"
#define OE_IMAGE_VERSION_FILE "/etc/image-version"
@@ -305,7 +303,7 @@ void CImageInfo::InitInfoData()
config.clear();
}
config.loadConfig(VERSION_FILE);
config.loadConfig(IMAGE_VERSION_FILE);
string version_string = config.getString("version", "");
@@ -331,7 +329,7 @@ void CImageInfo::InitInfoData()
}else
version_string = oe_image_version;
}else
printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s]\n", __func__, __LINE__, VERSION_FILE, version_string.c_str());
printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s]\n", __func__, __LINE__, IMAGE_VERSION_FILE, version_string.c_str());
#endif
image_info_t imagename = {g_Locale->getText(LOCALE_IMAGEINFO_IMAGE), config.getString("imagename", PACKAGE_NAME)};

2
src/gui/network_setup.cpp
View File

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

4
src/gui/update.cpp
View File

@@ -179,7 +179,7 @@ bool CFlashUpdate::checkOnlineVersion()
CConfigFile _configfile('\t');
std::string versionString = "????????????????";
if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
if (_configfile.loadConfig(IMAGE_VERSION_FILE))
versionString = _configfile.getString("version", "????????????????");
dprintf(DEBUG_NORMAL, "[update] file %s\n", g_settings.softupdate_url_file.c_str());
CFlashVersionInfo curInfo(versionString.c_str());
@@ -235,7 +235,7 @@ bool CFlashUpdate::selectHttpImage(void)
std::string versionString = "????????????????";
std::string imagedescription = "";
std::string imageversion = "n/a";
if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
if (_configfile.loadConfig(IMAGE_VERSION_FILE))
{
versionString = _configfile.getString("version", "????????????????");
imagedescription = _configfile.getString("imagedescription", "");

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

@@ -826,7 +826,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("/.version");
hh->SendFile(IMAGE_VERSION_FILE);
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
@@ -2103,7 +2103,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::VersionCGI(CyhookHandler *hh)
{
hh->SendFile("/.version");
hh->SendFile(IMAGE_VERSION_FILE);
}
//-----------------------------------------------------------------------------
void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)