Merge pull request #273 from Installomator/Theile-labels-0.7_4

Theile labels 0.7 4_part 2

Labels.txt

@@ -317,12 +317,14 @@ wwdc
 xeroxphaser7800
 xink
 xquartz
+yed
 yubikeymanagerqt
 zappy
 zeplin
 zohoworkdrive
 zoom
 zoomclient
+zoomgov
 zoomrooms
 zulujdk11
 zulujdk13

fragments/labels/blender.sh

@@ -1,7 +1,7 @@
 blender)
     name="blender"
     type="dmg"
-    downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
+    downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep -m1 .dmg)
     appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
     expectedTeamID="68UA947AUU"
     ;;

fragments/labels/yed.sh

@@ -0,0 +1,8 @@
+yed)
+    # This label assumes accept of these T&C’s: https://www.yworks.com/resources/yed/license.html
+    name="yEd"
+    type="dmg"
+    downloadURL="https://www.yworks.com"$(curl -fs "https://www.yworks.com/products/yed/download" | grep -o -e "/resources/.*\.dmg" | tr " " '\n' | grep -o -e "/resources/.*\.dmg")
+    appNewVersion=$(echo $downloadURL | sed -E 's/.*-([0-9.]*)_.*\.dmg/\1/')
+    expectedTeamID="JD89S887M2"
+    ;;

fragments/labels/zoom.sh

@@ -1,9 +1,7 @@
 zoom)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
+    name="zoom.us"
-    name="Zoom.us"
     type="pkg"
     downloadURL="https://zoom.us/client/latest/ZoomInstallerIT.pkg"
-    appNewVersion=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://zoom.us/download" | grep Version | head -n 1 | sed -E 's/.* ([0-9.]* \(.*\)).*/\1/') # credit: Søren Theilgaard (@theilgaard)
+    appNewVersion="$(curl -fsIL ${downloadURL} | grep -i ^location | cut -d "/" -f5)"
     expectedTeamID="BJ4HAAB9B3"
-    blockingProcesses=( zoom.us )
     ;;

fragments/labels/zoomgov.sh

@@ -0,0 +1,7 @@
+zoomgov)
+    name="zoom.us"
+    type="pkg"
+    downloadURL="https://www.zoomgov.com/client/latest/ZoomInstallerIT.pkg"
+    appNewVersion="$(curl -fsIL ${downloadURL} | grep -i ^location | cut -d "/" -f5)"
+    expectedTeamID="BJ4HAAB9B3"
+    ;;