Revert "Merge branch 'dev' of https://github.com/scriptingosx/Installomator into dev"

This reverts commit 44a4c05df6, reversing
changes made to 7e40dc1e36.

Installomator.sh

@@ -217,14 +217,16 @@ longversion)
     downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
     expectedTeamID="5KQ3D3FG5H"
     ;;
-    googlechrome|googlechromepkg)
+googlechrome)
+    name="Google Chrome"
+    type="dmg"
+    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+    expectedTeamID="EQHXZ8M8AV"
+    ;;
+googlechromepkg)
     name="Google Chrome"
     type="pkg"
-        #
-        # Note: this url acknowledges that you accept the terms of service
-        # https://support.google.com/chrome/a/answer/9915669
-        #
-        downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg"
+    downloadURL="https://dl.google.com/chrome/mac/stable/gcem/GoogleChrome.pkg"
     expectedTeamID="EQHXZ8M8AV"
     updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
     updateToolArguments=( -runMode oneshot -userInitiated YES )
@@ -387,19 +389,11 @@ longversion)
     expectedTeamID="BJ4HAAB9B3"
     blockingProcesses=( zoom.us )
     ;;
-    # for compatibility 'sonos' will download and install the S1 Controller
-    # use 'sonoss2' for the new controller
-    sonos|sonoss1)
+sonos)
     # credit: Erik Stam (@erikstam)
-        name="Sonos S1 Controller"
-        type="dmg"
-        downloadURL="https://www.sonos.com/redir/controller_software_mac"
-        expectedTeamID="2G4LW83Q3E"
-        ;;
-    sonoss2)
     name="Sonos"
     type="dmg"
-        downloadURL="https://www.sonos.com/redir/controller_software_mac2"
+    downloadURL="https://www.sonos.com/redir/controller_software_mac"
     expectedTeamID="2G4LW83Q3E"
     ;;
 coderunner)
@@ -498,7 +492,7 @@ longversion)
     expectedTeamID="VEKTX9H2N7"
     ;;
 things)
-        name="Things3"
+    name="Things"
     type="zip"
     downloadURL="https://culturedcode.com/things/download/"
     expectedTeamID="JLMPQHK86H"
@@ -608,17 +602,10 @@ longversion)
     downloadURL=$(downloadURLFromGit jamf ReEnroller)
     expectedTeamID="PS2F6S478M"
     ;;
-    adobereaderdc|adobereaderdc-install)
+adobereaderdc)
     name="Adobe Acrobat Reader DC"
     type="pkgInDmg"
-        downloadURL=$(curl -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\\]",' | head -n 1 | cut -d \" -f 4)
-        expectedTeamID="JQ525L2MZD"
-        blockingProcesses=( "AdobeReader" )
-        ;;
-    adobereaderdc-update)
-        name="Adobe Acrobat Reader DC"
-        type="pkgInDmg"
-        downloadURL=$(adobecurrent=`curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDCUpd"$adobecurrent"_MUI.dmg)
+    downloadURL=$(adobecurrent=`curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
     expectedTeamID="JQ525L2MZD"
     blockingProcesses=( "AdobeReader" )
     ;;
@@ -643,14 +630,6 @@ longversion)
     downloadURL="https://laptop-updates.brave.com/latest/osx"
     expectedTeamID="9BNSXJN65R"
     ;;
-    torbrowser)
-        # credit: Søren Theilgaard (@theilgaard)
-        name="Tor Browser"
-        type="dmg"
-        downloadURL=https://www.torproject.org$(curl -fs https://www.torproject.org/download/ | grep "downloadLink" | grep dmg | cut -d '"' -f 4)
-        appNewVersion=$(curl -fs https://www.torproject.org/download/ | grep "downloadLink" | grep dmg | cut -d '"' -f 4 | cut -d / -f 4)
-        expectedTeamID="MADPSAYN6T"
-        ;;
 umbrellaroamingclient)
     # credit: Tadayuki Onishi (@kenchan0130)
     name="Umbrella Roaming Client"
@@ -709,13 +688,6 @@ longversion)
     downloadURL="https://updates.cdn-apple.com/2019/cert/061-41823-20191025-5efc5a59-d7dc-46d3-9096-396bb8cb4a73/SwiftRuntimeForCommandLineTools.dmg"
     expectedTeamID="Software Update"
     ;;
-    vmwarefusion)
-        # credit: Erik Stam (@erikstam)
-        name="VMware Fusion"
-        type="dmg"
-        downloadURL="https://www.vmware.com/go/getfusion"
-        expectedTeamID="EG7KH642X6"
-        ;;
 
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it