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

- unify backup suffixes

Browse Source 
Conflicts:
	data/scripts/backup.sh

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-11-10 22:01:57 +01:00
committed by Thilo Graf
parent 3c5ea6452c
commit 0a9a0e77e8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/backup.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
DATE=$(date +%Y-%m-%d_%H-%M-%S) DATE=$(date +%Y%m%d_%H%M)
USRF="/var/tuxbox/config/tobackup.conf" USRF="/var/tuxbox/config/tobackup.conf"
BAKF="$1/${2:-settings_${DATE}.tar.gz}" BAKF="$1/${2:-settings_${DATE}.tar.gz}"

9
src/gui/settings_manager.cpp
View File

@@ -42,7 +42,7 @@
#include <driver/display.h> #include <driver/display.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/display.h> #include <lib/libnet/libnet.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <system/debug.h> #include <system/debug.h>
@@ -106,8 +106,11 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
return res; return res;
} }
std::string fname = "neutrino.conf"; std::string hostName = "";
CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname); netGetHostname(hostName);
std::string timeStr = getNowTimeStr("_%Y%m%d_%H%M");
std::string fname = "neutrino_" + hostName + timeStr + ".conf";
CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname, 45);
sms->exec(NULL, ""); sms->exec(NULL, "");
delete sms; delete sms;