From 0cddc8a154ea137c2e49193a91e9bf72d86356f6 Mon Sep 17 00:00:00 2001
From: Charlie Garrison <cng@garrison.com.au>
Date: Sun, 26 May 2019 01:32:13 +1000
Subject: [PATCH 1/3] change to routeros native script rather than bash
 multiline commands

---
 deploy/routeros.sh | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/deploy/routeros.sh b/deploy/routeros.sh
index b22c64f8..aa7f9760 100644
--- a/deploy/routeros.sh
+++ b/deploy/routeros.sh
@@ -86,29 +86,23 @@ routeros_deploy() {
   _info "Trying to push cert '$_cfullchain' to router"
   scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
   # shellcheck disable=SC2029
-  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" bash -c "'
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=\
+    ftp,read,write,password,sensitive source=\"## generated by routeros deploy script in acme.sh \\r\
+    \n/certificate remove [ find name=$_cdomain.cer_0 ]\\r\
+    \n/certificate remove [ find name=$_cdomain.cer_1 ]\\r\
+    \ndelay 1\\r\
+    \n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"\\r\
+    \n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"\\r\
+    \ndelay 1\\r\
+    \n/file remove $_cdomain.cer\\r\
+    \n/file remove $_cdomain.key\\r\
+    \ndelay 2\\r\
+    \n/ip service set www-ssl certificate=$_cdomain.cer_0\\r\
+    \n$ROUTER_OS_ADDITIONAL_SERVICES\\r\
+    \n\"
+    "
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script remove \"LE Cert Deploy - $_cdomain\""
 
-/certificate remove $_cdomain.cer_0
-
-/certificate remove $_cdomain.cer_1
-
-delay 1
-
-/certificate import file-name=$_cdomain.cer passphrase=\"\"
-
-/certificate import file-name=$_cdomain.key passphrase=\"\"
-
-delay 1
-
-/file remove $_cdomain.cer
-
-/file remove $_cdomain.key
-
-delay 2
-
-/ip service set www-ssl certificate=$_cdomain.cer_0
-$ROUTER_OS_ADDITIONAL_SERVICES
-
-'"
   return 0
 }

From 03a407d4dfefb41eb35693c74d45a49d125df83a Mon Sep 17 00:00:00 2001
From: Charlie Garrison <cng@garrison.com.au>
Date: Wed, 29 May 2019 14:05:20 +1000
Subject: [PATCH 2/3] Added additional `shellcheck` ignores for client-side
 evaluation warning

Should pass CI tests now
---
 deploy/routeros.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/routeros.sh b/deploy/routeros.sh
index aa7f9760..035e13ac 100644
--- a/deploy/routeros.sh
+++ b/deploy/routeros.sh
@@ -101,7 +101,9 @@ routeros_deploy() {
     \n$ROUTER_OS_ADDITIONAL_SERVICES\\r\
     \n\"
     "
+  # shellcheck disable=SC2029
   ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
+  # shellcheck disable=SC2029
   ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script remove \"LE Cert Deploy - $_cdomain\""
 
   return 0

From c42dbbfec841aee2c515821e02a73cc3c0b80702 Mon Sep 17 00:00:00 2001
From: Charlie Garrison <cng@garrison.com.au>
Date: Mon, 3 Jun 2019 11:38:39 +1000
Subject: [PATCH 3/3] reformatted RouterOS script for shfmt checks

---
 deploy/routeros.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/deploy/routeros.sh b/deploy/routeros.sh
index 035e13ac..21c9196f 100644
--- a/deploy/routeros.sh
+++ b/deploy/routeros.sh
@@ -85,22 +85,23 @@ routeros_deploy() {
   scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
   _info "Trying to push cert '$_cfullchain' to router"
   scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
+  DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive 
+source=\"## generated by routeros deploy script in acme.sh
+\n/certificate remove [ find name=$_cdomain.cer_0 ]
+\n/certificate remove [ find name=$_cdomain.cer_1 ]
+\ndelay 1
+\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"
+\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"
+\ndelay 1
+\n/file remove $_cdomain.cer
+\n/file remove $_cdomain.key
+\ndelay 2
+\n/ip service set www-ssl certificate=$_cdomain.cer_0
+\n$ROUTER_OS_ADDITIONAL_SERVICES
+\n\"
+"
   # shellcheck disable=SC2029
-  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=\
-    ftp,read,write,password,sensitive source=\"## generated by routeros deploy script in acme.sh \\r\
-    \n/certificate remove [ find name=$_cdomain.cer_0 ]\\r\
-    \n/certificate remove [ find name=$_cdomain.cer_1 ]\\r\
-    \ndelay 1\\r\
-    \n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"\\r\
-    \n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"\\r\
-    \ndelay 1\\r\
-    \n/file remove $_cdomain.cer\\r\
-    \n/file remove $_cdomain.key\\r\
-    \ndelay 2\\r\
-    \n/ip service set www-ssl certificate=$_cdomain.cer_0\\r\
-    \n$ROUTER_OS_ADDITIONAL_SERVICES\\r\
-    \n\"
-    "
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "$DEPLOY_SCRIPT_CMD"
   # shellcheck disable=SC2029
   ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
   # shellcheck disable=SC2029