groove/Mikrotik-RouterOS-automatic-backup-and-update
1
0
Fork 0
mirror of https://github.com/beeyev/Mikrotik-RouterOS-automatic-backup-and-update.git synced 2025-12-06 10:19:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

small fixes

Browse source
This commit is contained in:
Alexander Tebiev 2023-11-11 20:53:44 +01:00
parent 65afc007ca
commit f705d4bbf6
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BackupAndUpdate.rsc
View file

@ -3,9 +3,9 @@
#----------SCRIPT INFORMATION--------------------------------------------------- #----------SCRIPT INFORMATION---------------------------------------------------
# #
# Script: Mikrotik RouterOS automatic backup & update # Script: Mikrotik RouterOS automatic backup & update
# Version: 22.11.12 # Version: 23.11.11
# Created: 07/08/2018 # Created: 07/08/2018
# Updated: 12/11/2022 # Updated: 11/11/2023
# Author: Alexander Tebiev # Author: Alexander Tebiev
# Website: https://github.com/beeyev # Website: https://github.com/beeyev
# You can contact me by e-mail at tebiev@mail.com # You can contact me by e-mail at tebiev@mail.com
@ -173,14 +173,12 @@ if ([:len [/system identity get name]] = 0 or [/system identity get name] = "Mik
## Export config file ## Export config file
:if ($sensitiveDataInConfig = true) do={ :if ($sensitiveDataInConfig = true) do={
:do { # Since RouterOS v7 it needs to be explicitly set that we want to export sensitive data
# Since RouterOS v7 it needs to be explicitly set that we want to export sensitive data :if ([:pick [/system package update get installed-version] 0 1] < 7) do={
/export compact show-sensitive terse file=$backupName; :execute "/export compact terse file=$backupName";
} on-error={ } else={
:log info "$SMP Exporting config file with sensitive data using old way `/export compact terse file`"; :execute "/export compact show-sensitive terse file=$backupName";
/export compact terse file=$backupName;
} }
} else={ } else={
/export compact hide-sensitive terse file=$backupName; /export compact hide-sensitive terse file=$backupName;
} }
@ -194,19 +192,18 @@ if ([:len [/system identity get name]] = 0 or [/system identity get name] = "Mik
:global buGlobalVarUpdateStep; :global buGlobalVarUpdateStep;
############### ^^^^^^^^^ GLOBALS ^^^^^^^^^ ############### ############### ^^^^^^^^^ GLOBALS ^^^^^^^^^ ###############
:local scriptVersion "22.11.12"; :local scriptVersion "23.11.11";
# Current time `hhMMss` # Current time `hh-mm-ss`
:local currentTime ([:pick [/system clock get time] 0 2] . [:pick [/system clock get time] 3 5] . [:pick [/system clock get time] 6 8]); :local currentTime ([:pick [/system clock get time] 0 2] . "-" . [:pick [/system clock get time] 3 5] . "-" . [:pick [/system clock get time] 6 8]);
:local currentDateTime ("-" . $currentTime); :local currentDateTime ("-" . $currentTime);
# Detect old date format, Example: `nov/11/2023` # Detect old date format, Example: `nov/11/2023`
:if ([:len [:tonum [:pick [/system clock get date] 0 1]]] = 0) do={ :if ([:len [:tonum [:pick [/system clock get date] 0 1]]] = 0) do={
:set currentDateTime ([:pick [/system clock get date] 7 11] . [:pick [/system clock get date] 0 3] . [:pick [/system clock get date] 4 6] . "-" . $currentTime); :set currentDateTime ([:pick [/system clock get date] 7 11] . [:pick [/system clock get date] 0 3] . [:pick [/system clock get date] 4 6] . "-" . $currentTime);
} } else={
# New date format, Example: `nov/11/2023` # New date format, Example: `2023-11-11`
else={
:set currentDateTime ([/system clock get date] . "-" . $currentTime); :set currentDateTime ([/system clock get date] . "-" . $currentTime);
}; };