From e18361b36ca4ee4260e7b5d55f1620c0682551f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 8 Sep 2021 13:36:23 +0200 Subject: [PATCH] zohoworkdrive --- fragments/labels/zohoworkdrive.sh | 3 +-- utils/checkLabels.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fragments/labels/zohoworkdrive.sh b/fragments/labels/zohoworkdrive.sh index f7a0f11..9dbb3f7 100644 --- a/fragments/labels/zohoworkdrive.sh +++ b/fragments/labels/zohoworkdrive.sh @@ -2,10 +2,9 @@ zohoworkdrive) # Using this label expects you to agree to these: # License Areemant: https://www.zoho.com/workdrive/zohoworkdrive-license-agreement.html # Privacy policy: https://www.zoho.com/privacy.html - name="ZohoWorkDrive" + name="Zoho WorkDrive" type="dmg" lines=$(curl -fs https://www.zohowebstatic.com/sites/all/themes/zoho/scripts/workdrive.js | grep files-accl.zohopublic.com | tr '"' "\n") downloadURL=$(echo "$lines" | grep -i "files-accl.zohopublic.com")$(echo "$lines" | grep -i -A17 "files-accl.zohopublic.com" | grep -i -A2 macintosh | tail -1) expectedTeamID="TZ824L8Y37" - appName="Zoho WorkDrive.app" ;; diff --git a/utils/checkLabels.sh b/utils/checkLabels.sh index 1132d4f..e90b03a 100755 --- a/utils/checkLabels.sh +++ b/utils/checkLabels.sh @@ -3,7 +3,7 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin # Check Installomator labels from fragments -# 2020 Søren Theilgaard (@theilgaard) +# 2021 Søren Theilgaard (@theilgaard) # This script will test labels and check if download link is active, and if version is defined. # If labels are written to the script only those will be tested. @@ -31,7 +31,7 @@ if [[ $(sw_vers -buildVersion ) < "18" ]]; then exit 98 fi -currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }') +currentUser=$(stat -f "%Su" /dev/console) # MARK: Functions