From 193d51d49fa4a6684b6564277f07b790c0e86187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Tue, 11 Jan 2022 16:32:18 +0100
Subject: [PATCH] `curlOptions` as array.

---
 README.md                         |  5 +++--
 fragments/header.sh               |  5 +++--
 fragments/labels/mochakeyboard.sh |  9 +++++++++
 fragments/labels/mochatelnet.sh   |  9 +++++++++
 fragments/labels/mochatn3270.sh   | 18 +++++++++---------
 fragments/labels/mochatn3812.sh   |  9 +++++++++
 fragments/labels/mochatn5250.sh   |  9 +++++++++
 7 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index aaac96b..f325f34 100644
--- a/README.md
+++ b/README.md
@@ -317,10 +317,11 @@ The URL from which to download the archive.
 The URL can be generated by a series of commands, for example when you need to parse an xml file for the latest URL. (See `bbedit`, `desktoppr`, or `omnigraffle` for examples.)
 Sometimes version differs between Intel and Apple Silicon versions. (See `brave`,  `obsidian`, `omnidisksweeper`, or `notion`).
 
-- `curlOptions`: (optional)
+- `curlOptions`: (array, optional)
 Options to the `curl` command, needed for `curl` to be able to download the software.
 Usually used for adding extra headers that some servers need in order to serve the file.
-(see “mocha”-labels, for examples).
+`curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" )`
+(See “mocha”-labels, for examples on labels, and `buildLabel.sh` for header-examples.)
 
 - `appNewVersion` (optional, but recommended):
 Version of the downloaded software.
diff --git a/fragments/header.sh b/fragments/header.sh
index baea5b9..a514960 100644
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -149,10 +149,11 @@ REOPEN="yes"
 #   URL to download the dmg.
 #   Can be generated with a series of commands (see BBEdit for an example).
 #
-# - curlOptions: (optional)
+# - curlOptions: (array, optional)
 #   Options to the curl command, needed for curl to be able to download the software.
 #   Usually used for adding extra headers that some servers need in order to serve the file.
-#   (see “mocha”-labels, for examples).
+#   curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" )
+#   (See “mocha”-labels, for examples on labels, and buildLabel.sh for header-examples.)
 #
 # - appNewVersion: (optional)
 #   Version of the downloaded software.
diff --git a/fragments/labels/mochakeyboard.sh b/fragments/labels/mochakeyboard.sh
index 5f742a5..17445e0 100644
--- a/fragments/labels/mochakeyboard.sh
+++ b/fragments/labels/mochakeyboard.sh
@@ -2,6 +2,15 @@ mochakeyboard)
     name="Mocha Keyboard"
     type="appInDmgInZip"
     downloadURL="https://mochasoft.dk/mochakeyboard.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
     appNewVersion=""
     expectedTeamID="RR9F5EPNVW"
     ;;
diff --git a/fragments/labels/mochatelnet.sh b/fragments/labels/mochatelnet.sh
index 5eba112..b34d58f 100644
--- a/fragments/labels/mochatelnet.sh
+++ b/fragments/labels/mochatelnet.sh
@@ -2,6 +2,15 @@ mochatelnet)
     name="Telnet"
     type="appInDmgInZip"
     downloadURL="https://mochasoft.dk/telnet.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
     appNewVersion=""
     expectedTeamID="RR9F5EPNVW"
     ;;
diff --git a/fragments/labels/mochatn3270.sh b/fragments/labels/mochatn3270.sh
index b375fc6..4be205d 100644
--- a/fragments/labels/mochatn3270.sh
+++ b/fragments/labels/mochatn3270.sh
@@ -2,15 +2,15 @@ mochatn3270)
     name="TN3270"
     type="appInDmgInZip"
     downloadURL="https://mochasoft.dk/tn3270.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
     appNewVersion=""
-    curlOptions="-H \"User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15\" \
--H \"accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9\" \
--H \"accept-encoding: gzip, deflate, br\" \
--H \"accept-language: en-US,en;q=0.9\" \
--H \"sec-fetch-dest: document\" \
--H \"sec-fetch-mode: navigate\" \
--H \"sec-fetch-user: ?1\" \
--H \"sec-gpc: 1\" \
--H \"upgrade-insecure-requests: 1\" "
     expectedTeamID="RR9F5EPNVW"
     ;;
diff --git a/fragments/labels/mochatn3812.sh b/fragments/labels/mochatn3812.sh
index 54f3884..e27a33e 100644
--- a/fragments/labels/mochatn3812.sh
+++ b/fragments/labels/mochatn3812.sh
@@ -2,6 +2,15 @@ mochatn3812)
     name="TN3812"
     type="appInDmgInZip"
     downloadURL="https://mochasoft.dk/tn3812.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
     appNewVersion=""
     expectedTeamID="Frydendal"
     ;;
diff --git a/fragments/labels/mochatn5250.sh b/fragments/labels/mochatn5250.sh
index ae8ccf2..2707120 100644
--- a/fragments/labels/mochatn5250.sh
+++ b/fragments/labels/mochatn5250.sh
@@ -2,6 +2,15 @@ mochatn5250)
     name="TN5250"
     type="appInDmgInZip"
     downloadURL="https://mochasoft.dk/tn5250.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
     appNewVersion=""
     expectedTeamID="RR9F5EPNVW"
     ;;