Merge branch 'dev' into detectxswift-add

This commit is contained in:
Armin Briegel
2020-08-25 14:10:47 +02:00
committed by GitHub
2 changed files with 29 additions and 1 deletions

View File

@@ -147,7 +147,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
| awk -F '"' "/browser_download_url/ && /$archiveName/ { print \$4 }") | awk -F '"' "/browser_download_url/ && /$archiveName/ { print \$4 }")
else else
downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \ downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
| awk -F '"' "/browser_download_url/ && /$filetype/ { print \$4 }") | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4 }")
fi fi
if [ -z "$downloadURL" ]; then if [ -z "$downloadURL" ]; then
printlog "could not retrieve download URL for $gitusername/$gitreponame" printlog "could not retrieve download URL for $gitusername/$gitreponame"
@@ -796,6 +796,31 @@ detectxswift)
type="zip" type="zip"
downloadURL="https://s3.amazonaws.com/sqwarq.com/PublicZips/DetectX_Swift.app.zip" downloadURL="https://s3.amazonaws.com/sqwarq.com/PublicZips/DetectX_Swift.app.zip"
expectedTeamID="MAJ5XBJSG3" expectedTeamID="MAJ5XBJSG3"
autopkgr)
name="AutoPkgr"
type="dmg"
downloadURL=$(curl -fs "https://api.github.com/repos/lindegroup/autopkgr/releases/latest" \
| awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
expectedTeamID="JVY2ZR6SEF"
;;
airserver)
name="AirServer"
type="dmg"
downloadURL="https://www.airserver.com/download/mac/latest"
expectedTeamID="6C755KS5W3"
vscodium)
name="VSCodium"
type="dmg"
downloadURL=$(curl -fs "https://api.github.com/repos/VSCodium/vscodium/releases/latest" \
| awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
expectedTeamID="C7S3ZQ2B8V"
appName="VSCodium.app"
blockingProcesses=( Electron )
keepassxc)
name="KeePassXC"
type="dmg"
downloadURL="$(downloadURLFromGit keepassxreboot keepassxc)"
expectedTeamID="G2S7P7J672"
;; ;;

View File

@@ -3,10 +3,12 @@
adobereaderdc adobereaderdc
adobereaderdc-install adobereaderdc-install
adobereaderdc-update adobereaderdc-update
airserver
appcleaner appcleaner
aquaskk aquaskk
atom atom
autodmg autodmg
autopkgr
aviatrix aviatrix
bbedit bbedit
bettertouchtool bettertouchtool
@@ -93,6 +95,7 @@ tunnelbear
umbrellaroamingclient umbrellaroamingclient
visualstudiocode visualstudiocode
vlc vlc
vscodium
webexmeetings webexmeetings
webexteams webexteams
whatsapp whatsapp