Merge branch 'backup-filename-date' into next

backup-{email,upload}: add setting in configuration
backup-upload: support date & time in filename
2026-07-07 01:41:33 +00:00 · 2026-04-24 14:41:56 +02:00 · 2026-04-24 14:41:56 +02:00 · 2026-04-24 14:41:56 +02:00
2 changed files with 4 additions and 4 deletions
--- a/backup-email.rsc
+++ b/backup-email.rsc
@ -75,8 +75,8 @@
  # filename based on identity
  :local DirName ("tmpfs/" . $ScriptName);
  :local Clock [ /system/clock/get ];
-  :local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse \
+  :local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse ($BackupFileNameDate = true) \
-      ($BackupFileNameDate = true) ("-" . $Clock->"date" . "-" . $Clock->"time") "" ] ) ];
+      ("-" . $Clock->"date" . "-" . $Clock->"time" . "-" . $Clock->"gmt-offset") "" ] ) ];
  :local FilePath ($DirName . "/" . $FileName);
  :local BackupFile "none";
  :local ExportFile "none";
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@ -74,8 +74,8 @@
  # filename based on identity
  :local DirName ("tmpfs/" . $ScriptName);
  :local Clock [ /system/clock/get ];
-  :local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse \
+  :local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse ($BackupFileNameDate = true) \
-      ($BackupFileNameDate = true) ("-" . $Clock->"date" . "-" . $Clock->"time") "" ] ) ];
+      ("-" . $Clock->"date" . "-" . $Clock->"time" . "-" . $Clock->"gmt-offset") "" ] ) ];
  :local FilePath ($DirName . "/" . $FileName);
  :local BackupFile "none";
  :local ExportFile "none";
Author	SHA1	Message	Date
Christian Hesse	e47e0532f3	Merge branch 'backup-filename-date' into next	2026-04-24 14:41:56 +02:00
Christian Hesse	db09ed3826	backup-{email,upload}: add setting in configuration	2026-04-24 14:41:56 +02:00
Christian Hesse	ad31e2d3a2	backup-upload: support date & time in filename	2026-04-24 14:41:56 +02:00