From ed01f6d741b603fd440e9a88b759ed522f066aca Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Tue, 3 May 2022 15:51:45 +0200
Subject: [PATCH 1/6] Create new label iDrive

---
 fragments/labels/idrive.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fragments/labels/idrive.sh

diff --git a/fragments/labels/idrive.sh b/fragments/labels/idrive.sh
new file mode 100644
index 0000000..6a16c03
--- /dev/null
+++ b/fragments/labels/idrive.sh
@@ -0,0 +1,9 @@
+idrive)
+    name="IDrive"
+    type="pkgInDmg"
+    pkgName="IDrive.pkg"
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    versionKey="CFBundleVersion"
+    expectedTeamID="JWDCNYZ922"
+    ;;

From 0141b8334e2559eee9cf41df66a3ac2f1e99f9f1 Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Tue, 3 May 2022 16:28:31 +0200
Subject: [PATCH 2/6] Create new label idrivethin

---
 .gitignore                     |  1 +
 Installomator.sh               | 22 ++++++++++++++++++++--
 fragments/labels/idrivethin.sh |  9 +++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 fragments/labels/idrivethin.sh

diff --git a/.gitignore b/.gitignore
index 4211055..88cfe0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ scratch/
 # do include Installomator .pkg files
 #!Installomator-*.pkg
 checkLabelCurrent.sh
+Installomator.sh
diff --git a/Installomator.sh b/Installomator.sh
index 3f64473..2a4e1cc 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then
         rosetta2=no
     fi
 fi
-VERSION="9.1"
-VERSIONDATE="2022-03-18"
+VERSION="9.2beta"
+VERSIONDATE="2022-05-03"
 
 # MARK: Functions
 
@@ -2534,6 +2534,24 @@ icons)
     appNewVersion=$(versionFromGit sap macOS-icon-generator )
     expectedTeamID="7R5ZEU67FQ"
     ;;
+idrive)
+    name="IDrive"
+    type="pkgInDmg"
+    pkgName="IDrive.pkg"
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    versionKey="CFBundleVersion"
+    expectedTeamID="JWDCNYZ922"
+    ;;
+idrivethin)
+    name="IDrive"
+    type="pkgInDmg"
+    pkgName="IDriveThin.pkg"
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    versionKey="CFBundleVersion"
+    expectedTeamID="JWDCNYZ922"
+    ;;
 iina)
     name="IINA"
     type="dmg"
diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh
new file mode 100644
index 0000000..c4ff619
--- /dev/null
+++ b/fragments/labels/idrivethin.sh
@@ -0,0 +1,9 @@
+idrivethin)
+    name="IDrive"
+    type="pkgInDmg"
+    pkgName="IDriveThin.pkg"
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    versionKey="CFBundleVersion"
+    expectedTeamID="JWDCNYZ922"
+    ;;

From 01d00aa361185f2bdf7c97a954bcbf61667f2e7e Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Tue, 3 May 2022 16:35:14 +0200
Subject: [PATCH 3/6] Revert "Create new label idrivethin"

This reverts commit 0141b8334e2559eee9cf41df66a3ac2f1e99f9f1.
---
 .gitignore                     |  1 -
 Installomator.sh               | 22 ++--------------------
 fragments/labels/idrivethin.sh |  9 ---------
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 fragments/labels/idrivethin.sh

diff --git a/.gitignore b/.gitignore
index 88cfe0b..4211055 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@ scratch/
 # do include Installomator .pkg files
 #!Installomator-*.pkg
 checkLabelCurrent.sh
-Installomator.sh
diff --git a/Installomator.sh b/Installomator.sh
index 2a4e1cc..3f64473 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then
         rosetta2=no
     fi
 fi
-VERSION="9.2beta"
-VERSIONDATE="2022-05-03"
+VERSION="9.1"
+VERSIONDATE="2022-03-18"
 
 # MARK: Functions
 
@@ -2534,24 +2534,6 @@ icons)
     appNewVersion=$(versionFromGit sap macOS-icon-generator )
     expectedTeamID="7R5ZEU67FQ"
     ;;
-idrive)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDrive.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
 iina)
     name="IINA"
     type="dmg"
diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh
deleted file mode 100644
index c4ff619..0000000
--- a/fragments/labels/idrivethin.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;

From 8b5f5d40c9b1417aa2695a94f61d56b6d3304863 Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Tue, 3 May 2022 16:41:40 +0200
Subject: [PATCH 4/6] Create new label idrivethin

---
 fragments/labels/idrivethin.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fragments/labels/idrivethin.sh

diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh
new file mode 100644
index 0000000..c4ff619
--- /dev/null
+++ b/fragments/labels/idrivethin.sh
@@ -0,0 +1,9 @@
+idrivethin)
+    name="IDrive"
+    type="pkgInDmg"
+    pkgName="IDriveThin.pkg"
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    versionKey="CFBundleVersion"
+    expectedTeamID="JWDCNYZ922"
+    ;;

From dd50a618e933f8bd19d136299dedea9ca3184f42 Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Tue, 3 May 2022 16:42:02 +0200
Subject: [PATCH 5/6] Revert "Create new label idrivethin"

This reverts commit 8b5f5d40c9b1417aa2695a94f61d56b6d3304863.
---
 fragments/labels/idrivethin.sh | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 fragments/labels/idrivethin.sh

diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh
deleted file mode 100644
index c4ff619..0000000
--- a/fragments/labels/idrivethin.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;

From 84b9a98e136b7486ece927a2db6345be3690035e Mon Sep 17 00:00:00 2001
From: worthypants <6388066+worthypants@users.noreply.github.com>
Date: Mon, 16 May 2022 14:46:10 +0200
Subject: [PATCH 6/6] updated label idrive

corrected downloadURL and appNewVersion
---
 fragments/labels/idrive.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fragments/labels/idrive.sh b/fragments/labels/idrive.sh
index 6a16c03..31dca50 100644
--- a/fragments/labels/idrive.sh
+++ b/fragments/labels/idrive.sh
@@ -2,8 +2,8 @@ idrive)
     name="IDrive"
     type="pkgInDmg"
     pkgName="IDrive.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/')
+    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g')
+    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g')
     versionKey="CFBundleVersion"
     expectedTeamID="JWDCNYZ922"
     ;;