From b93d4d40bc946ac31fcdb619343e21717d816e99 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 9 Apr 2019 17:53:48 +0200
Subject: drop deprecated mode= for fetch

---
 check-certificates  | 2 +-
 daily-psk.capsman   | 2 +-
 daily-psk.local     | 2 +-
 daily-psk.template  | 2 +-
 global-functions    | 4 ++--
 gps-track           | 2 +-
 update-tunnelbroker | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/check-certificates b/check-certificates
index 8315d15..26f17ba 100644
--- a/check-certificates
+++ b/check-certificates
@@ -34,7 +34,7 @@
       :error "No CertRenewUrl given.";
     }
 
-    / tool fetch mode=https check-certificate=yes-without-crl url=($CertRenewUrl . $CommonName . ".pem");
+    / tool fetch check-certificate=yes-without-crl ($CertRenewUrl . $CommonName . ".pem");
     :foreach PassPhrase in=$CertRenewPass do={
       / certificate import file-name=($CommonName . ".pem") passphrase=$PassPhrase;
     }
diff --git a/daily-psk.capsman b/daily-psk.capsman
index ff0b658..06c69f8 100644
--- a/daily-psk.capsman
+++ b/daily-psk.capsman
@@ -74,7 +74,7 @@
         :local Attach "qrcode-daily.png";
 
         :do {
-          / tool fetch mode=https check-certificate=yes-without-crl \
+          / tool fetch check-certificate=yes-without-crl \
               $Url dst-path=$Attach;
         } on-error={
           :set Attach "";
diff --git a/daily-psk.local b/daily-psk.local
index 1b994fd..8e22e54 100644
--- a/daily-psk.local
+++ b/daily-psk.local
@@ -74,7 +74,7 @@
         :local Attach "qrcode-daily.png";
 
         :do {
-          / tool fetch mode=https check-certificate=yes-without-crl \
+          / tool fetch check-certificate=yes-without-crl \
               $Url dst-path=$Attach;
         } on-error={
           :set Attach "";
diff --git a/daily-psk.template b/daily-psk.template
index 2044281..4cb7cd2 100644
--- a/daily-psk.template
+++ b/daily-psk.template
@@ -80,7 +80,7 @@
         :local Attach "qrcode-daily.png";
 
         :do {
-          / tool fetch mode=https check-certificate=yes-without-crl \
+          / tool fetch check-certificate=yes-without-crl \
               $Url dst-path=$Attach;
         } on-error={
           :set Attach "";
diff --git a/global-functions b/global-functions
index a4b0f99..92d9d57 100644
--- a/global-functions
+++ b/global-functions
@@ -130,7 +130,7 @@
   :do {
     :local Vendor;
     $CertificateAvailable "Let's Encrypt Authority X3" "letsencrypt";
-    :set Vendor ([ / tool fetch mode=https check-certificate=yes-without-crl \
+    :set Vendor ([ / tool fetch check-certificate=yes-without-crl \
         ("https://api.macvendors.com/" . [ :pick $Mac 0 8 ]) output=user as-value ]->"data");
     :return $Vendor;
   } on-error={
@@ -176,7 +176,7 @@
 
   $CertificateAvailable "Let's Encrypt Authority X3" "letsencrypt";
   :do {
-    / tool fetch mode=https check-certificate=yes-without-crl \
+    / tool fetch check-certificate=yes-without-crl \
       ("https://upgrade.mikrotik.com/routeros/" . $PkgVer . "/" . $PkgFile) \
       dst-path=$PkgDest;
   } on-error={
diff --git a/gps-track b/gps-track
index 3870c60..572d662 100644
--- a/gps-track
+++ b/gps-track
@@ -13,7 +13,7 @@
 if ($Gps->"valid" = true) do={
   :set ($Gps->"latitude") [ :pick ($Gps->"latitude") 0 [ :find ($Gps->"latitude") "\00" ] ];
   :set ($Gps->"longitude") [ :pick ($Gps->"longitude") 0 [ :find ($Gps->"longitude") "\00" ] ];
-  :tool fetch mode=https check-certificate=yes-without-crl \
+  :tool fetch check-certificate=yes-without-crl \
     $GpsTrackUrl keep-result=no \
     http-method=post http-header-field="Content-Type: application/json" \
     http-data=("{" . \
diff --git a/update-tunnelbroker b/update-tunnelbroker
index 4eff911..f6674b6 100644
--- a/update-tunnelbroker
+++ b/update-tunnelbroker
@@ -29,7 +29,7 @@
 
     $CertificateAvailable "Starfield Secure Certificate Authority - G2" "starfield";
     :log info ("Local address changed, sending UPDATE to tunnelbroker! New address: " . $PublicAddress);
-    / tool fetch mode=https check-certificate=yes-without-crl \
+    / tool fetch check-certificate=yes-without-crl \
         ("https://ipv4.tunnelbroker.net/nic/update\?hostname=" . $Id) \
         user=$User password=$Pass keep-result=no;
     / interface 6to4 set $Interface local-address=$PublicAddress;
-- 
cgit v1.2.3-70-g09d2