From 7e75683d769af92184d594bafdd278b5484197be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 10 Nov 2021 08:57:31 +0100 Subject: [PATCH] Adobe CC with CLIInstaller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I was looking into installing Adobe CC fully (Isaac has done the hard part), and we can add `CLIInstaller` and `CLIArguments` to get it fully installed. This implementation is slightly changed from Isaacs. ``` % sudo /Users/st/Documents/GitHub/Installomator/utils/assemble.sh -r adobecreativeclouddesktop DEBUG=0 INSTALL=force 2021-11-10 08:56:00 adobecreativeclouddesktop setting variable from argument DEBUG=0 2021-11-10 08:56:00 adobecreativeclouddesktop setting variable from argument INSTALL=force 2021-11-10 08:56:00 adobecreativeclouddesktop ################## Start Installomator v. 0.8.0 2021-11-10 08:56:00 adobecreativeclouddesktop ################## adobecreativeclouddesktop 2021-11-10 08:56:00 adobecreativeclouddesktop BLOCKING_PROCESS_ACTION=tell_user 2021-11-10 08:56:00 adobecreativeclouddesktop NOTIFY=success 2021-11-10 08:56:00 adobecreativeclouddesktop LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2021-11-10 08:56:00 adobecreativeclouddesktop no blocking processes defined, using Creative Cloud as default 2021-11-10 08:56:00 adobecreativeclouddesktop Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.0LNrXCQX 2021-11-10 08:56:01 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 08:56:01 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 08:56:01 adobecreativeclouddesktop appversion: 2021-11-10 08:56:01 adobecreativeclouddesktop Latest version of Creative Cloud is 5.6.0.788 2021-11-10 08:56:01 adobecreativeclouddesktop Downloading https://ccmdl.adobe.com/AdobeProducts/KCCC/CCD/5_6_0/macarm64/ACCCx5_6_0_788.dmg to Creative Cloud.dmg 2021-11-10 08:56:30 adobecreativeclouddesktop no more blocking processes, continue with update 2021-11-10 08:56:30 adobecreativeclouddesktop Installing Creative Cloud 2021-11-10 08:56:30 adobecreativeclouddesktop Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.0LNrXCQX/Creative Cloud.dmg 2021-11-10 08:56:30 adobecreativeclouddesktop Mounted: /Volumes/Creative Cloud 2021-11-10 08:56:30 adobecreativeclouddesktop Verifying: /Volumes/Creative Cloud/Install.app 2021-11-10 08:56:30 adobecreativeclouddesktop Team ID matching: JQ525L2MZD (expected: JQ525L2MZD ) 2021-11-10 08:56:30 adobecreativeclouddesktop Downloaded version of Creative Cloud is 2.6.0.46 (replacing version ). 2021-11-10 08:56:30 adobecreativeclouddesktop CLIInstaller exists, running installer command /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install --mode=silent 2021-11-10 08:56:34 adobecreativeclouddesktop Debugging enabled, update tool output was: objc[51900]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102d2a018) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10fa75790). One of the two will be used. Which one is undefined. objc[51900]: Class ProxyManager is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102d2a068) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10fa757e0). One of the two will be used. Which one is undefined. objc[51900]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102d2a018) and /Volumes/Creative Cloud/resources/AdobePIM.dylib (0x110a87790). One of the two will be used. Which one is undefined. objc[51900]: Class ProxyManager is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102d2a068) and /Volumes/Creative Cloud/resources/AdobePIM.dylib (0x110a877e0). One of the two will be used. Which one is undefined. Starting installer... Installation successful. 2021-11-10 08:56:34 adobecreativeclouddesktop Finishing… 2021-11-10 08:56:44 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 08:56:44 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 08:56:44 adobecreativeclouddesktop Installed Creative Cloud 2021-11-10 08:56:44 adobecreativeclouddesktop notifying 2021-11-10 08:56:44 adobecreativeclouddesktop Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.0LNrXCQX 2021-11-10 08:56:44 adobecreativeclouddesktop Unmounting /Volumes/Creative Cloud "disk4" ejected. 2021-11-10 08:56:45 adobecreativeclouddesktop App not closed, so no reopen. 2021-11-10 08:56:45 adobecreativeclouddesktop ################## End Installomator, exit code 0 ``` --- fragments/functions.sh | 17 +++++++++++++++-- fragments/labels/adobecreativeclouddesktop.sh | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 fragments/labels/adobecreativeclouddesktop.sh diff --git a/fragments/functions.sh b/fragments/functions.sh index 446bbd5..6475479 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -369,7 +369,9 @@ installAppWithPath() { # $1: path to app to install in $targetDir # not running as root cleanupAndExit 6 "not running as root, exiting" fi - + + # Test if variable CLIInstaller is set + if [[ -z $CLIInstaller ]]; then # remove existing application if [ -e "$targetDir/$appName" ]; then printlog "Removing existing $targetDir/$appName" @@ -382,7 +384,6 @@ installAppWithPath() { # $1: path to app to install in $targetDir cleanupAndExit 7 "Error while copying" fi - # set ownership to current user if [ "$currentUser" != "loginwindow" ]; then printlog "Changing owner to $currentUser" @@ -391,6 +392,18 @@ installAppWithPath() { # $1: path to app to install in $targetDir printlog "No user logged in, not changing user" fi + elif [[ ! -z $CLIInstaller ]]; then + mountname=$(dirname $appPath) + printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" #INFO + + CLIoutput=$("$mountname/$CLIInstaller" "${CLIArguments[@]}" 2>&1) + CLIstatus=$(echo $?) + logoutput="$CLIoutput" # dedupliatelogs "$CLIoutput" + cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error: $logoutput" #ERROR + fi + printlog "Debugging enabled, update tool output was: $logoutput" #DEBUG + fi + } mountDMG() { diff --git a/fragments/labels/adobecreativeclouddesktop.sh b/fragments/labels/adobecreativeclouddesktop.sh new file mode 100644 index 0000000..9faef3f --- /dev/null +++ b/fragments/labels/adobecreativeclouddesktop.sh @@ -0,0 +1,16 @@ +adobecreativeclouddesktop) + appName="Install.app" + name="Creative Cloud" + type="dmg" + 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" | cut -d '"' -f1 | head -1) + 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" | cut -d '"' -f1 | head -1) + fi + #downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*dmg" | head -1) + 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) + CLIInstaller="Install.app/Contents/MacOS/Install" + CLIArguments=(--mode=silent) + expectedTeamID="JQ525L2MZD" + Company="Adobe" + ;;