From 5bf24ab7b490d52e8fa677723a3fd494894d0164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 1 Dec 2021 22:25:31 +0100
Subject: [PATCH] GitHub fixes

---
 fragments/labels/autopkgr.sh   |  2 --
 fragments/labels/dangerzone.sh |  6 +++---
 fragments/labels/ferdi.sh      | 13 ++++++-------
 fragments/labels/gpgsync.sh    |  5 +++--
 fragments/labels/proxyman.sh   | 13 +++++++------
 fragments/labels/wireshark.sh  |  1 -
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/fragments/labels/autopkgr.sh b/fragments/labels/autopkgr.sh
index 2937f08..4a4cf82 100644
--- a/fragments/labels/autopkgr.sh
+++ b/fragments/labels/autopkgr.sh
@@ -1,8 +1,6 @@
 autopkgr)
-    # credit: Søren Theilgaard (@theilgaard)
     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 }")
     downloadURL=$(downloadURLFromGit lindegroup autopkgr)
     appNewVersion=$(versionFromGit lindegroup autopkgr)
     expectedTeamID="JVY2ZR6SEF"
diff --git a/fragments/labels/dangerzone.sh b/fragments/labels/dangerzone.sh
index ab9cf57..1bdeada 100644
--- a/fragments/labels/dangerzone.sh
+++ b/fragments/labels/dangerzone.sh
@@ -1,7 +1,7 @@
 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"
+    downloadURL="$(downloadURLFromGit firstlookmedia dangerzone)"
+    appNewVersion="$(versionFromGit firstlookmedia dangerzone)"
+    expectedTeamID="N9B95FDWH4"
     ;;
diff --git a/fragments/labels/ferdi.sh b/fragments/labels/ferdi.sh
index f081f0a..28a2a12 100644
--- a/fragments/labels/ferdi.sh
+++ b/fragments/labels/ferdi.sh
@@ -1,13 +1,12 @@
 ferdi)
     name="Ferdi"
     type="zip"
-    if [[ $(arch) == i386 ]]; then
-    downloadURL=$(curl --silent --fail "https://api.github.com/repos/getferdi/ferdi/releases/latest" \
-    | awk -F '"' "/browser_download_url/ && /mac.zip/ && ! /blockmap/ && ! /arm64-mac/ && ! /AppImage/{ print \$4 }")
-    elif [[ $(arch) == arm64 ]]; then
-    downloadURL=$(downloadURLFromGit getferdi ferdi )
-    archiveName="arm64-mac.zip"
-    fi    
+    if [[ $(arch) == "arm64" ]]; then
+        archiveName="arm64-mac.zip"
+    elif [[ $(arch) == "i386" ]]; then
+        archiveName="Ferdi-[0-9.]*-mac.zip"
+    fi
+    downloadURL="$(downloadURLFromGit getferdi ferdi)"
     appNewVersion=$(versionFromGit getferdi ferdi )
     expectedTeamID="B6J9X9DWFL"
     ;;
diff --git a/fragments/labels/gpgsync.sh b/fragments/labels/gpgsync.sh
index 814875f..af3b5ca 100644
--- a/fragments/labels/gpgsync.sh
+++ b/fragments/labels/gpgsync.sh
@@ -1,7 +1,8 @@
 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)"
+    packageID="org.firstlook.gpgsync"
+    downloadURL="$(downloadURLFromGit firstlookmedia gpgsync)"
+    appNewVersion="$(versionFromGit firstlookmedia gpgsync)"
     expectedTeamID="P24U45L8P5"
     ;;
diff --git a/fragments/labels/proxyman.sh b/fragments/labels/proxyman.sh
index cb78fe3..eddcd8f 100644
--- a/fragments/labels/proxyman.sh
+++ b/fragments/labels/proxyman.sh
@@ -1,7 +1,8 @@
 proxyman)
-	name="Proxyman"
-	type="dmg"
-	downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
-	expectedTeamID="3X57WP8E8V"
-	appNewVersion=$(curl -s -L https://github.com/ProxymanApp/Proxyman | grep -o 'releases/tag/.*\>' | awk -F '/' '{print $3}')
-	;;
+    name="Proxyman"
+    type="dmg"
+    #downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
+    downloadURL="$(downloadURLFromGit ProxymanApp Proxyman)"
+    appNewVersion="$(versionFromGit ProxymanApp Proxyman)"
+    expectedTeamID="3X57WP8E8V"
+    ;;
diff --git a/fragments/labels/wireshark.sh b/fragments/labels/wireshark.sh
index d9617b5..3c4dafb 100644
--- a/fragments/labels/wireshark.sh
+++ b/fragments/labels/wireshark.sh
@@ -1,5 +1,4 @@
 wireshark)
-    # credit: Oh4sh0 https://github.com/Oh4sh0
     name="Wireshark"
     type="dmg"
     downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"