Merge pull request #406 from Installomator/2022-02-02_Theile-base

Version 9.0 fixed, from branch 2022 02 02 theile base

fragments/labels/diskspace.sh

@@ -0,0 +1,8 @@
+diskspace)
+    name="diskspace"
+    type="pkg"
+    packageID="com.scriptingosx.diskspace"
+    downloadURL="$(downloadURLFromGit scriptingosx diskspace)"
+    appNewVersion="$(versionFromGit scriptingosx diskspace)"
+    expectedTeamID="JME5BW3F3R"
+    ;;

fragments/labels/eshareosx.sh

@@ -1,7 +1,7 @@
 eshareosx)
     name="e-Share"
     type="pkg"
-    packageID="com.ncryptedcloud.e-Share.pkg"
+    #packageID="com.ncryptedcloud.e-Share.pkg"
     downloadURL=https://www.ncryptedcloud.com/static/downloads/osx/$(curl -fs https://www.ncryptedcloud.com/static/downloads/osx/ | grep -o -i "href.*\".*\"" | cut -d '"' -f2)
     versionKey="CFBundleVersion"
     appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z\-]*_([0-9.]*)\.pkg/\1/g' )

fragments/labels/evernote.sh

@@ -1,7 +1,7 @@
 evernote)
     name="Evernote"
     type="dmg"
-    downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | cut -d '"' -f2)
+    downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | grep -ioe "href.*" | cut -d '"' -f2)
     appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
     expectedTeamID="Q79WDW8YH9"
     appName="Evernote.app"

fragments/labels/golang.sh

@@ -1,10 +1,9 @@
 golang)
-    # credit: Søren Theilgaard (@theilgaard)
     name="GoLang"
     type="pkg"
     packageID="org.golang.go"
-    downloadURL="$(curl -fsIL "https://golang.org$(curl -fs "https://golang.org/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')"
-    appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go"
+    downloadURL="https://go.dev$(curl -fs "https://go.dev/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")"
+    appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go" in the beginning
     expectedTeamID="EQHXZ8M8AV"
     blockingProcesses=( NONE )
     ;;

fragments/labels/logitechoptions.sh

@@ -1,8 +1,9 @@
 logitechoptions)
     name="Logitech Options"
     type="pkgInZip"
-    downloadURL=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options.*\.zip")
-    appNewVersion=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/options.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
+    #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1)
+    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip"
+    appNewVersion=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/options/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
     #pkgName="LogiMgr Installer "*".app/Contents/Resources/LogiMgr.pkg"
     pkgName=LogiMgr.pkg
     expectedTeamID="QED4VVPZWA"

fragments/labels/mattermost.sh

@@ -3,7 +3,7 @@ mattermost)
     type="dmg"
     archiveName="mac-universal.dmg"
     downloadURL=$(downloadURLFromGit mattermost desktop)
-    appNewVersion=$(versionFromGit mattermost desktop )
+    appNewVersion=$(versionFromGit mattermost desktop)
     expectedTeamID="UQ8HT4Q2XM"
-    Mattermost Helper (Renderer).app app.asar
+    blockingProcesses=( "Mattermost Helper.app" "Mattermost Helper (Renderer).app" "Mattermost Helper (GPU).app" "Mattermost Helper (Plugin).app" )
     ;;

fragments/labels/mochakeyboard.sh

@@ -0,0 +1,16 @@
+mochakeyboard)
+    name="Mocha Keyboard"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/mochakeyboard.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;

fragments/labels/mochatelnet.sh

@@ -0,0 +1,16 @@
+mochatelnet)
+    name="Telnet"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/telnet.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;

fragments/labels/mochatn3270.sh

@@ -0,0 +1,16 @@
+mochatn3270)
+    name="TN3270"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3270.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;

fragments/labels/mochatn3812.sh

@@ -0,0 +1,16 @@
+mochatn3812)
+    name="TN3812"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3812.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="Frydendal"
+    ;;

fragments/labels/mochatn5250.sh

@@ -0,0 +1,16 @@
+mochatn5250)
+    name="TN5250"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn5250.dmg.zip"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;

fragments/labels/promiseutility.sh

@@ -1,3 +1,4 @@
+promiseutility|\
 promiseutilityr)
     name="Promise Utility"
     type="pkgInDmg"

fragments/labels/tom4aconverter.sh

@@ -2,6 +2,6 @@ tom4aconverter)
      name="To M4A Converter"
      type="dmg"
      downloadURL="https://amvidia.com/downloads/to-m4a-converter-mac.dmg"
-     appNewVersion=curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}'
+     appNewVersion=$(curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}')
      expectedTeamID="F2TH9XX9CJ"
      ;;

fragments/labels/wacomdrivers.sh

@@ -1,8 +1,8 @@
 wacomdrivers)
     name="Wacom Desktop Center"
     type="pkgInDmg"
-    downloadURL="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep -e "drivers/mac/professional.*dmg" | head -1 | sed -e 's/data-download-link="//g' -e 's/"//' | awk '{$1=$1}{ print }' | sed 's/\r//')"
+    downloadURL="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep -e "drivers/mac/professional.*dmg" | head -1 | tr '"' "\n" | grep -i http)"
     expectedTeamID="EG27766DY7"
-    pkgName="Install Wacom Tablet.pkg"
-    appNewVersion="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep mac/professional/releasenotes | head -1 | awk -F"|" '{print $1}' | awk -F"Driver" '{print $3}' | sed -e 's/ (.*//g' | tr -d ' ')"
+    #pkgName="Install Wacom Tablet.pkg"
+    appNewVersion="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep mac/professional/releasenotes | head -1 | tr '"' "\n" | grep -e "Driver [0-9][-0-9.]*" | sed -E 's/Driver ([-0-9.]*).*/\1/g')"
     ;;

fragments/labels/wallyezflash.sh

@@ -2,6 +2,7 @@ wallyezflash)
     name="Wally"
     type="dmg"
     downloadURL="https://configure.zsa.io/wally/osx"
+    # 2022-02-07: Info.plist is totally wrong defined and contains no version information
     #appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i ^location | head -1 | sed -E 's/.*\/[a-zA-Z\-]*-([0-9.]*)\..*/\1/g')
     expectedTeamID="V32BWKSNYH"
     #versionKey="CFBundleVersion"