From d80c76a4d3721534588cf1b00d15509af2ac9319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 7 Jan 2022 20:41:35 +0100
Subject: [PATCH] mocha-software and buildLabel.sh

Improved buildLabel.sh to handle another set of headers when trying to download, and that can handle the mocha-software.

But mocha-software has been disabled, as Installomator does not offer the headers when that is trying to download.
---
 fragments/{broken => disabled}/mightymike.sh | 0
 fragments/disabled/mochakeyboard.sh          | 7 +++++++
 fragments/disabled/mochatelnet.sh            | 7 +++++++
 fragments/disabled/mochatn3270.sh            | 7 +++++++
 fragments/disabled/mochatn3812.sh            | 7 +++++++
 fragments/disabled/mochatn5250.sh            | 7 +++++++
 fragments/{broken => disabled}/nanosaur.sh   | 0
 utils/buildLabel.sh                          | 9 ++++++++-
 8 files changed, 43 insertions(+), 1 deletion(-)
 rename fragments/{broken => disabled}/mightymike.sh (100%)
 create mode 100644 fragments/disabled/mochakeyboard.sh
 create mode 100644 fragments/disabled/mochatelnet.sh
 create mode 100644 fragments/disabled/mochatn3270.sh
 create mode 100644 fragments/disabled/mochatn3812.sh
 create mode 100644 fragments/disabled/mochatn5250.sh
 rename fragments/{broken => disabled}/nanosaur.sh (100%)

diff --git a/fragments/broken/mightymike.sh b/fragments/disabled/mightymike.sh
similarity index 100%
rename from fragments/broken/mightymike.sh
rename to fragments/disabled/mightymike.sh
diff --git a/fragments/disabled/mochakeyboard.sh b/fragments/disabled/mochakeyboard.sh
new file mode 100644
index 0000000..5f742a5
--- /dev/null
+++ b/fragments/disabled/mochakeyboard.sh
@@ -0,0 +1,7 @@
+mochakeyboard)
+    name="Mocha Keyboard"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/mochakeyboard.dmg.zip"
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
diff --git a/fragments/disabled/mochatelnet.sh b/fragments/disabled/mochatelnet.sh
new file mode 100644
index 0000000..5eba112
--- /dev/null
+++ b/fragments/disabled/mochatelnet.sh
@@ -0,0 +1,7 @@
+mochatelnet)
+    name="Telnet"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/telnet.dmg.zip"
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
diff --git a/fragments/disabled/mochatn3270.sh b/fragments/disabled/mochatn3270.sh
new file mode 100644
index 0000000..74ce410
--- /dev/null
+++ b/fragments/disabled/mochatn3270.sh
@@ -0,0 +1,7 @@
+mochatn3270)
+    name="TN3270"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3270.dmg.zip"
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
diff --git a/fragments/disabled/mochatn3812.sh b/fragments/disabled/mochatn3812.sh
new file mode 100644
index 0000000..54f3884
--- /dev/null
+++ b/fragments/disabled/mochatn3812.sh
@@ -0,0 +1,7 @@
+mochatn3812)
+    name="TN3812"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3812.dmg.zip"
+    appNewVersion=""
+    expectedTeamID="Frydendal"
+    ;;
diff --git a/fragments/disabled/mochatn5250.sh b/fragments/disabled/mochatn5250.sh
new file mode 100644
index 0000000..ae8ccf2
--- /dev/null
+++ b/fragments/disabled/mochatn5250.sh
@@ -0,0 +1,7 @@
+mochatn5250)
+    name="TN5250"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn5250.dmg.zip"
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
diff --git a/fragments/broken/nanosaur.sh b/fragments/disabled/nanosaur.sh
similarity index 100%
rename from fragments/broken/nanosaur.sh
rename to fragments/disabled/nanosaur.sh
diff --git a/utils/buildLabel.sh b/utils/buildLabel.sh
index 87e6ded..8f96e3c 100755
--- a/utils/buildLabel.sh
+++ b/utils/buildLabel.sh
@@ -99,10 +99,17 @@ dmgInvestigation() {
     
     if [[ $appPath != "" ]]; then
         echo "App found: $appPath"
+        if [[ $archiveExt = "dmgInZip" ]]; then
+            archiveExt="appInDmgInZip"
+        fi
         appInvestigation
     elif [[ $pkgPath != "" ]]; then
         echo "PKG found: $pkgPath"
-        archiveExt="pkgInDmg"
+        if [[ $archiveExt = "dmgInZip" ]]; then
+            archiveExt="pkgInDmgInZip not supported, yet!"
+        else
+            archiveExt="pkgInDmg"
+        fi
         pkgInvestigation
     else
         echo "Nothing found on DMG."