adobecreativeclouddesktop and adobereaderdc-update

Fixing #694 and fixing #687
This commit is contained in:
Theile
2022-09-30 10:14:13 +02:00
parent 5e1dba614a
commit 3f41926cf9
2 changed files with 19 additions and 10 deletions

View File

@@ -1,22 +1,24 @@
adobecreativeclouddesktop) adobecreativeclouddesktop)
name="Adobe Creative Cloud" name="Adobe Creative Cloud"
appName="Install.app"
type="dmg" type="dmg"
if pgrep -q "Adobe Installer"; then if pgrep -q "Adobe Installer"; then
printlog "Adobe Installer is running, not a good time to update." WARN printlog "Adobe Installer is running, not a good time to update." WARN
printlog "################## End $APPLICATION \n\n" INFO printlog "################## End $APPLICATION \n\n" INFO
exit 75 exit 75
fi fi
adobeurl="https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" if [[ "$(arch)" == "arm64" ]]; then
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)
downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'macarm64')][contains(text(),'Download')]/@href)" - 2> /dev/null) else
elif [[ $(arch) == "i386" ]]; then 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)
downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'osx10')][contains(text(),'Download')]/@href)" - 2> /dev/null)
fi 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=$(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=$(echo $downloadURL | grep -o '[^x]*$' | cut -d '.' -f 1 | sed 's/_/\./g')
targetDir="/Applications/Utilities/Adobe Creative Cloud/ACC/"
installerTool="Install.app" installerTool="Install.app"
CLIInstaller="Install.app/Contents/MacOS/Install" CLIInstaller="Install.app/Contents/MacOS/Install"
CLIArguments=(--mode=silent) CLIArguments=(--mode=silent)
expectedTeamID="JQ525L2MZD" expectedTeamID="JQ525L2MZD"
blockingProcesses=( "Creative Cloud" )
Company="Adobe" Company="Adobe"
;; ;;

View File

@@ -2,12 +2,19 @@ adobereaderdc-update)
name="Adobe Acrobat Reader DC" name="Adobe Acrobat Reader DC"
type="pkgInDmg" type="pkgInDmg"
if [[ -d "/Applications/Adobe Acrobat Reader DC.app" ]]; then 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" 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" 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 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." 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" 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
fi fi
adobecurrent=$(curl -sL https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.') adobecurrent=$(curl -sL https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.')