diff options
| author |  Christian Hesse <mail@eworm.de> | 2021-04-28 20:16:08 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2021-04-28 20:16:08 +0200 |
| commit | da877612209b217fdfd5429889b6d7284bfd10a5 (patch) | |
| tree | 17fae6776664e6c550c3ba3b2ea7025779b9c35e /upload-backup | |
| parent | d4c9d1c577d14991a63f285e57fcf2cfaa2d5cd4 (diff) | |
| parent | 56b75237754eb065aecb932b3082ba0ca29c3f7c (diff) | |
Merge branch 'notifications' into next
Diffstat (limited to 'upload-backup')
| -rw-r--r-- | upload-backup | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/upload-backup b/upload-backup index 15adc1f..921b196 100644 --- a/upload-backup +++ b/upload-backup @@ -26,7 +26,7 @@ :global LogPrintExit2; :global RandomDelay; :global ScriptFromTerminal; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global WaitForFile; :global WaitFullyConnected; @@ -80,13 +80,14 @@ $WaitFullyConnected; } } -$SendNotification [ $IfThenElse ($Failed > 0) \ +$SendNotification2 ({ origin=$0; \ + subject=[ $IfThenElse ($Failed > 0) \ ([ $SymbolForNotification "warning-sign" ] . "Backup & Config upload with failure") \ - ([ $SymbolForNotification "floppy-disk" ] . "Backup & Config upload") ] \ - ("Backup and config export upload for " . $Identity . ".\n\n" . \ + ([ $SymbolForNotification "floppy-disk" ] . "Backup & Config upload") ]; \ + message=("Backup and config export upload for " . $Identity . ".\n\n" . \ [ $DeviceInfo ] . "\n\n" . \ "Backup file: " . $BackupFile . "\n" . \ - "Config file: " . $ConfigFile) "" "true"; + "Config file: " . $ConfigFile); silent=true }); :if ($Failed = 1) do={ :error "An error occured!"; |