Labels fixed

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"
-    ;;
+    ;;

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"
-    ;;
+    ;;

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"
-    ;;
+    ;;

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"
-    ;;
+    ;;

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"
-    ;;
+    ;;

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)
+    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-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString'  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"
-    ;;
+    ;;

fragments/labels/sketch.sh

@@ -1,15 +1,7 @@
 sketch)
-     name="Sketch"
+    name="Sketch"
-     type="zip"
+    type="zip"
-     downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g')
+    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
+    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"
+    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"
-    ;;

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"
+    ;;

fragments/labels/snagit.sh

@@ -5,4 +5,4 @@ snagit2020)
     type="dmg"
     downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg"
     expectedTeamID="7TQL462TU8"
-    ;;
+    ;;

fragments/labels/tigervnc.sh

@@ -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/<pre><a onclick="navi(event)" href="://' | sed 's/".*//' | sort -V | tail -1)
-    expectedTeamID="S5LX88A9BW"
-    ;;

utils/checkLabels.sh

@@ -29,6 +29,8 @@ if [[ $(sw_vers -buildVersion ) < "18" ]]; then
     exit 98
 fi
 
+currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')
+
 
 # MARK: Functions
 
@@ -118,7 +120,7 @@ for label in $allLabels; do
     name=""; type=""; downloadURL=""; appNewVersion=""; expectedTeamID=""; blockingProcesses=""; updateTool=""; updateToolArguments=""; archiveName=""
     
     #caseLabel
-    cat "${pathToLabels}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > 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} )