Merge branch 'line-breaks' into nextrouteros-7.14-1

10 files changed, 13 insertions, 15 deletions

diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc
index 000532a..7dae679 100644
--- a/mod/bridge-port-to.rsc
+++ b/mod/bridge-port-to.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # reset bridge ports to default bridge
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/bridge-port-to.md
diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc
index 760e8a6..c9f55ae 100644
--- a/mod/bridge-port-vlan.rsc
+++ b/mod/bridge-port-vlan.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # manage VLANs on bridge ports
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/bridge-port-vlan.md
diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index 5adca0a..73205b2 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # inspect variables
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/inspectvar.md
@@ -14,9 +14,8 @@
 # inspect variable and print on terminal
 :set InspectVar do={
   :global InspectVarReturn;
-  :global PrettyPrint;
 
-  $PrettyPrint [ $InspectVarReturn $1 ];
+  :put [ :tocrlf [ $InspectVarReturn $1 ] ];
 }
 
 # inspect variable and return formatted string
diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc
index 128ca54..003bdc3 100644
--- a/mod/ipcalc.rsc
+++ b/mod/ipcalc.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # ip address calculation
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/ipcalc.md
@@ -17,17 +17,16 @@
 
   :global FormatLine;
   :global IPCalcReturn;
-  :global PrettyPrint;
 
   :local Values [ $IPCalcReturn $1 ];
 
-  $PrettyPrint ( \
+  :put [ :tocrlf ( \
     [ $FormatLine "Address" ($Values->"address") ] . "\n" . \
     [ $FormatLine "Netmask" ($Values->"netmask") ] . "\n" . \
     [ $FormatLine "Network" ($Values->"network") ] . "\n" . \
     [ $FormatLine "HostMin" ($Values->"hostmin") ] . "\n" . \
     [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \
-    [ $FormatLine "Broadcast" ($Values->"broadcast") ]);
+    [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ];
 }
 
 # calculate and return netmask, network, min host, max host and broadcast
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index df2e81a..3d62ddf 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # send notifications via e-mail
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-email.md
diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 196633a..3adc1df 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -4,7 +4,7 @@
 #                         Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # send notifications via Matrix
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-matrix.md
diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index cdc10e7..661f69f 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # send notifications via Ntfy (ntfy.sh)
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-ntfy.md
diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 1890483..671bd1c 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # send notifications via Telegram
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-telegram.md
diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index c3972a0..3d5dce9 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # download script and run it once
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/scriptrunonce.md
diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 6272a93..8cafa95 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # import ssh keys for public key authentication
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/ssh-keys-import.md