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

* Software Update with apply the settings (Part6)

Browse Source 
- Use identifier '#:' for config vars in settingsupdate.conf
This commit is contained in:
micha-bbg
2012-11-03 15:34:34 +01:00
parent 27fe0fe6e0
commit f4f954415b
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/settingsupdate.conf
View File

@@ -1,6 +1,6 @@
# settings for logfile # settings for logfile
Log=1 #:Log=1
LogFile=/tmp/update.log #:LogFile=/tmp/update.log
## M<>gliche Eintr<74>ge: ## M<>gliche Eintr<74>ge:

17
src/gui/ext_update.cpp
View File

@@ -385,7 +385,7 @@ bool CExtUpdate::copyFileList(const std::string & fileList, const std::string &
bool CExtUpdate::findConfigEntry(std::string & line, std::string find) bool CExtUpdate::findConfigEntry(std::string & line, std::string find)
{ {
if (line.find(find + "=") == 0) { if (line.find("#:" + find + "=") == 0) {
size_t pos = line.find_first_of('='); size_t pos = line.find_first_of('=');
line = line.substr(pos+1); line = line.substr(pos+1);
line = trim(line); line = trim(line);
@@ -442,21 +442,20 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
size_t pos; size_t pos;
while(fgets(buf, sizeof(buf), f1) != NULL) { while(fgets(buf, sizeof(buf), f1) != NULL) {
std::string line = buf; std::string line = buf;
// remove comments
line = trim(line); line = trim(line);
if (line.find_first_of("#") == 0) // remove comments
if (line.find_first_of("#") == 0) {
if (line.find_first_of(":") == 1) { // config vars
if (line.length() > 1)
readConfig(line);
}
continue; continue;
}
pos = line.find_first_of("#"); pos = line.find_first_of("#");
if (pos != std::string::npos) { if (pos != std::string::npos) {
line = line.substr(0, pos); line = line.substr(0, pos);
line = trim(line); line = trim(line);
} }
// config vars
if (line.find_first_of("/+-~") != 0) {
if (line.length() > 1)
readConfig(line);
continue;
}
// special folders // special folders
else if ((line == "/") || (line == "/*") || (line == "/*.*") || (line.find("/dev") == 0) || (line.find("/proc") == 0) || else if ((line == "/") || (line == "/*") || (line == "/*.*") || (line.find("/dev") == 0) || (line.find("/proc") == 0) ||
(line.find("/sys") == 0) || (line.find("/mnt") == 0) || (line.find("/tmp") == 0)) { (line.find("/sys") == 0) || (line.find("/mnt") == 0) || (line.find("/tmp") == 0)) {