From aa761f2583b02a097fbd8693da78767c8d3c1001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Fri, 27 Aug 2021 12:16:51 +0200 Subject: [PATCH] Labels fixed --- fragments/labels/applenyfonts.sh | 4 ++-- fragments/labels/applesfcompact.sh | 4 ++-- fragments/labels/applesfmono.sh | 2 +- fragments/labels/applesfpro.sh | 4 ++-- fragments/labels/clevershare2.sh | 5 ++--- fragments/labels/royaltsx.sh | 6 +++--- fragments/labels/sketch.sh | 20 ++++++-------------- fragments/labels/skype.sh | 8 ++++++++ fragments/labels/snagit.sh | 2 +- fragments/labels/tigervnc.sh | 6 ------ utils/checkLabels.sh | 8 ++++++-- 11 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 fragments/labels/skype.sh delete mode 100644 fragments/labels/tigervnc.sh diff --git a/fragments/labels/applenyfonts.sh b/fragments/labels/applenyfonts.sh index 336dd48..f671819 100644 --- a/fragments/labels/applenyfonts.sh +++ b/fragments/labels/applenyfonts.sh @@ -1,7 +1,7 @@ applenyfonts) name="Apple New York Font Collection" type="pkgInDmg" - downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY-Font.dmg" + downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY.dmg" packageID="com.apple.pkg.NYFonts" expectedTeamID="Development Update" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/applesfcompact.sh b/fragments/labels/applesfcompact.sh index d32d6f2..f174053 100644 --- a/fragments/labels/applesfcompact.sh +++ b/fragments/labels/applesfcompact.sh @@ -1,7 +1,7 @@ applesfcompact) name="San Francisco Compact" type="pkgInDmg" - downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Compact.dmg" + downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" packageID="com.apple.pkg.SanFranciscoCompact" expectedTeamID="Development Update" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/applesfmono.sh b/fragments/labels/applesfmono.sh index 46c32a7..29233f1 100644 --- a/fragments/labels/applesfmono.sh +++ b/fragments/labels/applesfmono.sh @@ -4,4 +4,4 @@ applesfmono) downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" packageID="com.apple.pkg.SFMonoFonts" expectedTeamID="Software Update" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/applesfpro.sh b/fragments/labels/applesfpro.sh index 5c7deaa..9ba2628 100644 --- a/fragments/labels/applesfpro.sh +++ b/fragments/labels/applesfpro.sh @@ -1,7 +1,7 @@ applesfpro) name="San Francisco Pro" type="pkgInDmg" - downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Pro.dmg" + downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" packageID="com.apple.pkg.SanFranciscoPro" expectedTeamID="Development Update" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/clevershare2.sh b/fragments/labels/clevershare2.sh index 0429a17..1a7bb90 100644 --- a/fragments/labels/clevershare2.sh +++ b/fragments/labels/clevershare2.sh @@ -1,8 +1,7 @@ clevershare2) - # credit: Søren Theilgaard (@theilgaard) name="Clevershare" type="dmg" - downloadURL=$(curl -fs https://archive.clevertouch.com/clevershare2g | grep -i "_Mac" | tr '"' "\n" | grep "^http.*dmg") + downloadURL=$(curl -fs https://www.clevertouch.com/eu/clevershare2g | grep -i -o -E "https.*Mac.*\.dmg") appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z-]*_Mac\.([0-9.]*)\.[0-9]*\.dmg$/\1/g' ) expectedTeamID="P76M9BE8DQ" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/royaltsx.sh b/fragments/labels/royaltsx.sh index 38ac64f..af5082e 100644 --- a/fragments/labels/royaltsx.sh +++ b/fragments/labels/royaltsx.sh @@ -1,7 +1,7 @@ royaltsx) name="Royal TSX" type="dmg" - downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) - appNewVersion=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2) + downloadURL=$(curl -fs https://royaltsx-v5.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) + appNewVersion=$(curl -fs https://royaltsx-v5.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2) expectedTeamID="VXP8K9EDP6" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/sketch.sh b/fragments/labels/sketch.sh index 1f78e05..637a5b6 100644 --- a/fragments/labels/sketch.sh +++ b/fragments/labels/sketch.sh @@ -1,15 +1,7 @@ sketch) - name="Sketch" - type="zip" - downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g') - appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page - expectedTeamID="WUGMZZ5K46" - ;; -skype) - name="Skype" - type="dmg" - downloadURL="https://get.skype.com/go/getskype-skypeformac" - appNewVersion=$(curl -is "https://get.skype.com/go/getskype-skypeformac" | grep ocation: | grep -o "Skype-.*dmg" | cut -d "-" -f 2 | cut -d "." -f1-2) - expectedTeamID="AL798K98FX" - Company="Microsoft" - ;; + name="Sketch" + type="zip" + downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g') + appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page + expectedTeamID="WUGMZZ5K46" + ;; \ No newline at end of file diff --git a/fragments/labels/skype.sh b/fragments/labels/skype.sh new file mode 100644 index 0000000..f14d15b --- /dev/null +++ b/fragments/labels/skype.sh @@ -0,0 +1,8 @@ +skype) + name="Skype" + type="dmg" + downloadURL="https://get.skype.com/go/getskype-skypeformac" + appNewVersion=$(curl -is "https://get.skype.com/go/getskype-skypeformac" | grep ocation: | grep -o "Skype-.*dmg" | cut -d "-" -f 2 | cut -d "." -f1-2) + expectedTeamID="AL798K98FX" + Company="Microsoft" + ;; \ No newline at end of file diff --git a/fragments/labels/snagit.sh b/fragments/labels/snagit.sh index 2c65478..f748e1b 100644 --- a/fragments/labels/snagit.sh +++ b/fragments/labels/snagit.sh @@ -5,4 +5,4 @@ snagit2020) type="dmg" downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg" expectedTeamID="7TQL462TU8" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/tigervnc.sh b/fragments/labels/tigervnc.sh deleted file mode 100644 index b07a848..0000000 --- a/fragments/labels/tigervnc.sh +++ /dev/null @@ -1,6 +0,0 @@ -tigervnc) - name="TigerVNC Viewer" - type="dmg" - downloadURL=https://dl.bintray.com/tigervnc/stable/$(curl -s -l https://dl.bintray.com/tigervnc/stable/ | grep .dmg | sed 's/
 checkLabelCurrent.sh
+    if cat "${pathToLabels}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > checkLabelCurrent.sh; then
     source checkLabelCurrent.sh
 
     echo "Name: $name"
@@ -197,7 +199,9 @@ for label in $allLabels; do
     if (($archLabels[(Ie)$label])); then
         secondRoundLabels+=( "$label" )
     fi
-    
+    else
+        echo "Label: ${label} is not it's own file in Labels-folder. Skipping"
+    fi
     echo
 done
 allLabels=( ${=secondRoundLabels} )