Revert "santa and nomad are forced to ignore blocking"

CHANGELOG.md

@@ -1,63 +1,8 @@
-## v10beta3
-
-- option to add item to dock if dockutil is installed (#701 requires dockutil https://github.com/kcrawford/dockutil )
-- further improvements to GitHub downloads (#691)
-- updated user dialog when app is already on the latest version (#658)
-
-Plus everything from beta1 and beta2.
-
-- new labels:
-    - adobeacrobatprodc (#707)
-    - adobereaderdc-install (#707)
-    - archiwareb2go (#625, #707)
-    - archiwarepst (#624)
-    - bitrix24 (#661)
-    - charles (#670)
-    - chronoagent (#617)
-    - chronosync (#616)
-    - cytoscape (#689)
-    - egnytecore (#655)
-    - fellow (#599)
-    - filemakerpro (#609)
-    - fujifilmwebcam (#598)
-    - gfxcardstatus (#690)
-    - horos (#610)
-    - inetclearreportsdesigner (#601)
-    - jdk18 (#608)
-    - latexit (#684)
-    - nudgesuite (#633)
-    - origin (#662)
-    - parallelsrasclient (#607)
-    - polylens (#671)
-    - splashtopbusiness (#660)
-    - tailscale (#620)
-    - zoomoutlookplugin (#656)
-    - zotero (#634)
-    - zulujdk18 (#612)
-
-- updated labels:
-    - acroniscyberprotectconnectagent (#678)
-    - adobecreativeclouddesktop (#687)
-    - adobereaderdc-update (#707)
-    - audacity (#708)
-    - duckduckgo (#704)
-    - libreoffice (#605)
-    - nudge
-    - obs (#692)
-    - r (#702)
-    - rstudio (#702)
-    - screamingfrogseospider (#665)
-    - vlc (#705, #606)
-    - xcreds
-
-
-
 ## v10beta2
 
 - fixed problem with GitHub labels (#659)
 - bz2 archive support (#659)
 - fixed WorkspaceOne support (#653)
-- updated how `aapNewVersion` is determined (#680)
 
 Plus everything from v10beta1
 

Installomator.sh

@@ -323,7 +323,7 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then
     fi
 fi
 VERSION="10.0beta3"
-VERSIONDATE="2022-10-03"
+VERSIONDATE="2022-09-30"
 
 # MARK: Functions
 
@@ -2072,8 +2072,7 @@ bitrix24)
      downloadURL="https://dl.bitrix24.com/b24/bitrix24_desktop.dmg"
      expectedTeamID="5B3T3A994N"
      blockingProcesses=( "Bitrix24" )
-     ;;
-bitwarden)
+     ;;bitwarden)
     name="Bitwarden"
     type="dmg"
     downloadURL=$(downloadURLFromGit bitwarden desktop )
@@ -2248,8 +2247,7 @@ charles)
     appNewVersion=$(curl -fs https://www.charlesproxy.com/download/latest-release/ | sed -nE 's/.*version.*value="([^"]*).*/\1/p')
     downloadURL="https://www.charlesproxy.com/assets/release/$appNewVersion/charles-proxy-$appNewVersion.dmg"
     expectedTeamID="9A5PCU4FSD"
-    ;;
-chatwork)
+    ;;chatwork)
      name="Chatwork"
      type="dmg"
      downloadURL="https://desktop-app.chatwork.com/installer/Chatwork.dmg"
@@ -3309,15 +3307,6 @@ imazingprofileeditor)
     downloadURL="https://downloads.imazing.com/mac/iMazing-Profile-Editor/iMazingProfileEditorMac.dmg"
     expectedTeamID="J5PR93692Y"
     ;;
-inetclearreportsdesigner)
-    name="i-Net Clear Reports Designer"
-    type="appindmg"
-    appNewVersion=$(curl -s https://www.inetsoftware.de/products/clear-reports/designer | grep "Latest release:" | cut -d ">" -f 4 | cut -d \  -f 2)
-    downloadURL=$(curl -s https://www.inetsoftware.de/products/clear-reports/designer | grep $appNewVersion | grep dmg | cut -d ">" -f 12 | cut -d \" -f 2)
-    expectedTeamID="9S2Y97K3D9"
-    blockingProcesses=( "clear-reports-designer" )
-    #forcefulQuit=YES
-    ;;
 inkscape)
     # credit: Søren Theilgaard (@theilgaard)
     name="Inkscape"
@@ -4549,8 +4538,7 @@ origin)
      downloadURL="https://www.dm.origin.com/mac/download/Origin.dmg"
      expectedTeamID="TSTV75T6Q5"
      blockingProcesses=( "Origin" )
-     ;;
-ottomatic)
+     ;;ottomatic)
     name="Otto Matic"
     type="dmg"
     downloadURL=$(downloadURLFromGit jorio OttoMatic)
@@ -4589,13 +4577,6 @@ pandoc)
     archiveName="mac.pkg"
     expectedTeamID="5U2WKE6DES"
     ;;
-parallelsrasclient)
-    name="Parallels Client"
-    type="pkg"
-    appNewVersion=$(curl -sf "https://download.parallels.com/ras/v18/RAS%20Client%20for%20Mac%20Changelog.txt" | grep -m 1 "Parallels Client for Mac Version" | sed "s|.*Version \(.*\) -.*|\\1|" | sed 's/ /./g' | sed 's/[^0-9.]//g')
-    downloadURL=$(appMajorVersion=`sed 's/\..*//' <<< $appNewVersion` && appHyphenVersion=`curl -sf "https://download.parallels.com/ras/v18/RAS%20Client%20for%20Mac%20Changelog.txt" | grep -m 1 "Parallels Client for Mac Version" | sed "s|.*Version \(.*\) -.*|\\1|" | sed 's/ /-/g' | sed 's/[^0-9.-]//g'` && echo https://download.parallels.com/ras/v"$appMajorVersion"/"$appNewVersion"/RasClient-Mac-Notarized-"$appHyphenVersion".pkg)
-    expectedTeamID="4C6364ACXT"
-    ;;
 paretosecurity)
     name="Pareto Security"
     type="dmg"
@@ -5979,19 +5960,6 @@ zulujdk17)
     appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
     appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
     ;;
-zulujdk18)
-    name="Zulu JDK 18"
-    type="pkgInDmg"
-    packageID="com.azulsystems.zulu.18"
-    if [[ $(arch) == i386 ]]; then
-        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu18.*ca-jdk18.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
-    elif [[ $(arch) == arm64 ]]; then
-        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu18.*ca-jdk18.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
-    fi
-    expectedTeamID="TDTHCUPYFR"
-    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
-    appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
-    ;;
 zulujdk8)
     name="Zulu JDK 8"
     type="pkgInDmg"

Labels.txt

@@ -61,7 +61,6 @@ basecamp3
 bbedit
 bettertouchtool
 bitrix24
-bitwarden
 blender
 bluejeans
 bluejeanswithaudiodriver
@@ -82,7 +81,6 @@ camtasia2021
 canva
 carboncopycloner
 charles
-chatwork
 chronoagent
 chronosync
 cisdem-documentreader
@@ -204,7 +202,6 @@ idrivethin
 iina
 imageoptim
 imazingprofileeditor
-inetclearreportsdesigner
 inkscape
 insomnia
 installomator
@@ -335,12 +332,10 @@ openvpnconnect
 openvpnconnectv3
 opera
 origin
-ottomatic
 overflow
 pacifist
 packages
 pandoc
-parallelsrasclient
 paretosecurity
 parsec
 pdfsam
@@ -519,5 +514,4 @@ zulujdk11
 zulujdk13
 zulujdk15
 zulujdk17
-zulujdk18
 zulujdk8

fragments/labels/inetclearreportsdesigner.sh

@@ -1,9 +0,0 @@
-inetclearreportsdesigner)
-    name="i-Net Clear Reports Designer"
-    type="appindmg"
-    appNewVersion=$(curl -s https://www.inetsoftware.de/products/clear-reports/designer | grep "Latest release:" | cut -d ">" -f 4 | cut -d \  -f 2)
-    downloadURL=$(curl -s https://www.inetsoftware.de/products/clear-reports/designer | grep $appNewVersion | grep dmg | cut -d ">" -f 12 | cut -d \" -f 2)
-    expectedTeamID="9S2Y97K3D9"
-    blockingProcesses=( "clear-reports-designer" )
-    #forcefulQuit=YES
-    ;;

fragments/labels/zulujdk18.sh

@@ -1,13 +0,0 @@
-zulujdk18)
-    name="Zulu JDK 18"
-    type="pkgInDmg"
-    packageID="com.azulsystems.zulu.18"
-    if [[ $(arch) == i386 ]]; then
-        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu18.*ca-jdk18.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
-    elif [[ $(arch) == arm64 ]]; then
-        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu18.*ca-jdk18.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
-    fi
-    expectedTeamID="TDTHCUPYFR"
-    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
-    appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
-    ;;