Merge branch 'dev' into libreoffice

Installomator.sh

@@ -1440,7 +1440,43 @@ pymol)
     type="dmg"
     downloadURL=$(curl -s -L "https://pymol.org/" | grep -m 1 -Eio 'href="https://pymol.org/installers/PyMOL-(.*)-MacOS(.*).dmg"' | cut -c7- | sed -e 's/"$//')
     expectedTeamID="26SDDJ756N"
-    ;;    
+    ;;
+prism9)
+    # credit: Fredrik Larsson (@fredrik_l on MacAdmins Slack)
+    name="Prism 9"
+    type="dmg"
+    downloadURL="http://cdn.graphpad.com/downloads/prism/9/InstallPrism9.dmg"
+    expectedTeamID="YQ2D36NS9M"
+    ;;  
+gpgsuite)
+    # credit: Micah Lee (@micahflee)
+    name="GPG Suite"
+    type="pkgInDmg"
+    pkgName="Install.pkg"
+    downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
+    expectedTeamID="PKV8ZPD836"
+    ;;
+gpgsync)
+    # credit: Micah Lee (@micahflee)
+    name="GPG Sync"
+    type="pkg"
+    downloadURL="https://github.com$(curl -s -L https://github.com/firstlookmedia/gpgsync/releases/latest | grep /firstlookmedia/gpgsync/releases/download | grep \.pkg | cut -d'"' -f2)"
+    expectedTeamID="P24U45L8P5"
+    ;;
+dangerzone)
+    # credit: Micah Lee (@micahflee)
+    name="Dangerzone"
+    type="dmg"
+    downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2)
+    expectedTeamID="P24U45L8P5"
+    ;;
+libreoffice)
+    # credit: Micah Lee (@micahflee)
+    name="LibreOffice"
+    type="dmg"
+    downloadURL="https://download.documentfoundation.org/libreoffice/stable/$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)/mac/x86_64/LibreOffice_$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)_MacOS_x86-64.dmg"
+    expectedTeamID="7P5S3ZLCN7"
+    ;;
     
 # MARK: add new labels above here
 
@@ -1610,35 +1646,7 @@ microsoftdefenderatp)
     updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
     updateToolArguments=( --install --apps WDAV00 )
     ;;
-libreoffice)
+
-    # credit: Micah Lee (@micahflee)
-    name="LibreOffice"
-    type="dmg"
-    downloadURL="https://download.documentfoundation.org/libreoffice/stable/$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)/mac/x86_64/LibreOffice_$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)_MacOS_x86-64.dmg"
-    expectedTeamID="7P5S3ZLCN7"
-    ;;
-gpgsuite)
-    # credit: Micah Lee (@micahflee)
-    name="GPG Suite"
-    type="pkgInDmg"
-    pkgName="Install.pkg"
-    downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
-    expectedTeamID="PKV8ZPD836"
-    ;;
-gpgsync)
-    # credit: Micah Lee (@micahflee)
-    name="GPG Sync"
-    type="pkg"
-    downloadURL="https://github.com$(curl -s -L https://github.com/firstlookmedia/gpgsync/releases/latest | grep /firstlookmedia/gpgsync/releases/download | grep \.pkg | cut -d'"' -f2)"
-    expectedTeamID="P24U45L8P5"
-    ;;
-dangerzone)
-    # credit: Micah Lee (@micahflee)
-    name="Dangerzone"
-    type="dmg"
-    downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2)
-    expectedTeamID="P24U45L8P5"
-    ;;
 
 # this description is so you can provide all variables as arguments
 # it will only check if the required variables are setting

Labels.txt

@@ -43,6 +43,7 @@ githubdesktop
 googlechrome
 googlechromepkg
 googledrivefilestream
+googleearth
 googlejapaneseinput
 gpgsuite
 gpgsync
@@ -57,6 +58,7 @@ jamfpppcutility
 jamfreenroller
 karabinerelements
 keepassxc
+keka
 krisp
 libreoffice
 malwarebytes
@@ -90,7 +92,9 @@ plisteditpro
 postman
 prism7
 prism8
+prism9
 privileges
+pymol
 qgis-macos-pr
 r
 resiliosynchome