diff --git a/fragments/labels/adobecreativeclouddesktop.sh b/fragments/labels/adobecreativeclouddesktop.sh index c83da57..e12b911 100644 --- a/fragments/labels/adobecreativeclouddesktop.sh +++ b/fragments/labels/adobecreativeclouddesktop.sh @@ -1,22 +1,24 @@ adobecreativeclouddesktop) name="Adobe Creative Cloud" + appName="Install.app" type="dmg" if pgrep -q "Adobe Installer"; then printlog "Adobe Installer is running, not a good time to update." WARN printlog "################## End $APPLICATION \n\n" INFO exit 75 fi - adobeurl="https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" - if [[ $(arch) == "arm64" ]]; then - downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'macarm64')][contains(text(),'Download')]/@href)" - 2> /dev/null) - elif [[ $(arch) == "i386" ]]; then - downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'osx10')][contains(text(),'Download')]/@href)" - 2> /dev/null) + if [[ "$(arch)" == "arm64" ]]; then + downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o 'https.*macarm64.*dmg' | head -1 | cut -d '"' -f1) + else + downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o 'https.*osx10.*dmg' | head -1 | cut -d '"' -f1) fi - appNewVersion=$(curl -fs "https://helpx.adobe.com/creative-cloud/release-note/cc-release-notes.html" | grep "mandatory" | head -1 | grep -o "Version *.* released" | cut -d " " -f2) - #appNewVersion=$(echo "$downloadURL" | grep -o '[^x]*$' | cut -d '.' -f 1 | sed 's/_/\./g') + #appNewVersion=$(curl -fs "https://helpx.adobe.com/creative-cloud/release-note/cc-release-notes.html" | grep "mandatory" | head -1 | grep -o "Version *.* released" | cut -d " " -f2) + appNewVersion=$(echo $downloadURL | grep -o '[^x]*$' | cut -d '.' -f 1 | sed 's/_/\./g') + targetDir="/Applications/Utilities/Adobe Creative Cloud/ACC/" installerTool="Install.app" CLIInstaller="Install.app/Contents/MacOS/Install" CLIArguments=(--mode=silent) expectedTeamID="JQ525L2MZD" + blockingProcesses=( "Creative Cloud" ) Company="Adobe" ;; diff --git a/fragments/labels/adobereaderdc-update.sh b/fragments/labels/adobereaderdc-update.sh index 1637402..7a81c57 100644 --- a/fragments/labels/adobereaderdc-update.sh +++ b/fragments/labels/adobereaderdc-update.sh @@ -2,12 +2,19 @@ adobereaderdc-update) name="Adobe Acrobat Reader DC" type="pkgInDmg" if [[ -d "/Applications/Adobe Acrobat Reader DC.app" ]]; then + printlog "Found /Applications/Adobe Acrobat Reader DC.app" mkdir -p "/Library/Application Support/Adobe/Acrobat/11.0" defaults write "/Library/Application Support/Adobe/Acrobat/11.0/com.adobe.Acrobat.InstallerOverrides.plist" ReaderAppPath "/Applications/Adobe Acrobat Reader DC.app" - if ! [[ `defaults read "/Applications/Adobe Acrobat Reader DC.app/Contents/Resources/AcroLocale.plist"` ]]; then - printlog "Missing locale data, this will cause the updater to fail. Deleting Adobe Acrobat Reader DC.app and installing fresh." + if ! defaults read "/Applications/Adobe Acrobat Reader DC.app/Contents/Resources/AcroLocale.plist" ; then + printlog "Missing locale data, this will cause the updater to fail. Deleting Adobe Acrobat Reader DC.app and installing fresh." WARN rm -Rf "/Applications/Adobe Acrobat Reader DC.app" - $0 $1 $2 $3 adobereaderdc-install $5 $6 $7 $8 $9 ${10} ${11} + if [[ $1 == "/" ]]; then + printlog "Running through Jamf: $0." INFO + $0 $1 $2 $3 adobereaderdc-install ${5} ${6} ${7} ${8} ${9} ${10} ${11} + else + printlog "Installomator running locally: $0." INFO + $0 adobereaderdc-install ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} + fi fi fi adobecurrent=$(curl -sL https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.')