diff --git a/src/global.h b/src/global.h index 344586be4..54532fc22 100644 --- a/src/global.h +++ b/src/global.h @@ -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" diff --git a/src/gui/buildinfo.cpp b/src/gui/buildinfo.cpp index 864b63498..a17b6d0ce 100644 --- a/src/gui/buildinfo.cpp +++ b/src/gui/buildinfo.cpp @@ -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 diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 316e529b1..a95a8c845 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -54,8 +54,6 @@ #include #include -#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)}; diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 6893ab5cb..cda8124f8 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("/.version"); + config.loadConfig(IMAGE_VERSION_FILE); 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 6b72529b6..f385ddb80 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -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", ""); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 99dbfe037..e6e13113d 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -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)