From 638f7983dda0eab311c1d964d79bf10def55dc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 10 Nov 2021 11:34:30 +0100 Subject: [PATCH] Not using `mountname` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to the label, so path to CLIInstaller does not contain the name of the app, as that is already in the variable `appPath`. Still needing to decide on debug logging or what kind of message we want there. But this is succesfull: ``` % sudo /Users/st/Documents/GitHub/Installomator/utils/assemble.sh -r adobecreativeclouddesktop DEBUG=0 INSTALL=force Password: 2021-11-10 11:30:51 adobecreativeclouddesktop setting variable from argument DEBUG=0 2021-11-10 11:30:51 adobecreativeclouddesktop setting variable from argument INSTALL=force 2021-11-10 11:30:51 adobecreativeclouddesktop ################## Start Installomator v. 0.8.0 2021-11-10 11:30:51 adobecreativeclouddesktop ################## adobecreativeclouddesktop 2021-11-10 11:30:51 adobecreativeclouddesktop BLOCKING_PROCESS_ACTION=tell_user 2021-11-10 11:30:51 adobecreativeclouddesktop NOTIFY=success 2021-11-10 11:30:52 adobecreativeclouddesktop LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2021-11-10 11:30:52 adobecreativeclouddesktop no blocking processes defined, using Creative Cloud as default 2021-11-10 11:30:52 adobecreativeclouddesktop Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.wMH45Qfi 2021-11-10 11:30:52 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 11:30:52 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 11:30:52 adobecreativeclouddesktop appversion: 2021-11-10 11:30:52 adobecreativeclouddesktop Latest version of Creative Cloud is 5.6.0.788 2021-11-10 11:30:52 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 11:31:41 adobecreativeclouddesktop no more blocking processes, continue with update 2021-11-10 11:31:41 adobecreativeclouddesktop Installing Creative Cloud 2021-11-10 11:31:41 adobecreativeclouddesktop Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.wMH45Qfi/Creative Cloud.dmg 2021-11-10 11:31:42 adobecreativeclouddesktop Mounted: /Volumes/Creative Cloud 2 2021-11-10 11:31:42 adobecreativeclouddesktop Verifying: /Volumes/Creative Cloud 2/Install.app 2021-11-10 11:31:42 adobecreativeclouddesktop Team ID matching: JQ525L2MZD (expected: JQ525L2MZD ) 2021-11-10 11:31:42 adobecreativeclouddesktop Downloaded version of Creative Cloud is 2.6.0.46 (replacing version ). 2021-11-10 11:31:42 adobecreativeclouddesktop CLIInstaller exists, running installer command /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install --mode=silent 2021-11-10 11:31:46 adobecreativeclouddesktop Succesfully ran /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install --mode=silent 2021-11-10 11:31:46 adobecreativeclouddesktop Debugging enabled, update tool output was: objc[71312]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install (0x100c2f018) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10dc38790). One of the two will be used. Which one is undefined. objc[71312]: Class ProxyManager is implemented in both /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install (0x100c2f068) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10dc387e0). One of the two will be used. Which one is undefined. objc[71312]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install (0x100c2f018) and /Volumes/Creative Cloud 2/resources/AdobePIM.dylib (0x10e4e6790). One of the two will be used. Which one is undefined. objc[71312]: Class ProxyManager is implemented in both /Volumes/Creative Cloud 2/Install.app/Contents/MacOS/Install (0x100c2f068) and /Volumes/Creative Cloud 2/resources/AdobePIM.dylib (0x10e4e67e0). One of the two will be used. Which one is undefined. Starting installer... Installation successful. 2021-11-10 11:31:46 adobecreativeclouddesktop Finishing… 2021-11-10 11:31:56 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 11:31:56 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 11:31:56 adobecreativeclouddesktop Installed Creative Cloud 2021-11-10 11:31:56 adobecreativeclouddesktop notifying 2021-11-10 11:31:56 adobecreativeclouddesktop Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.wMH45Qfi 2021-11-10 11:31:56 adobecreativeclouddesktop Unmounting /Volumes/Creative Cloud 2 "disk6" ejected. 2021-11-10 11:31:57 adobecreativeclouddesktop App not closed, so no reopen. 2021-11-10 11:31:57 adobecreativeclouddesktop ################## End Installomator, exit code 0 ``` --- fragments/functions.sh | 12 +++++++----- fragments/labels/adobecreativeclouddesktop.sh | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fragments/functions.sh b/fragments/functions.sh index 777b61e..0a47499 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -393,17 +393,19 @@ installAppWithPath() { # $1: path to app to install in $targetDir fi elif [[ ! -z $CLIInstaller ]]; then - mountname=$(dirname $appPath) - printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" #INFO + #mountname=$(dirname $appPath) + printlog "CLIInstaller exists, running installer command $appPath/$CLIInstaller $CLIArguments" #INFO - CLIoutput=$("$mountname/$CLIInstaller" "${CLIArguments[@]}" 2>&1) + CLIoutput=$("$appPath/$CLIInstaller" "${CLIArguments[@]}" 2>&1) CLIstatus=$(echo $?) logoutput="$CLIoutput" # dedupliatelogs "$CLIoutput" if [ $CLIstatus -ne 0 ] ; then - cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error: $logoutput" #ERROR + cleanupAndExit 3 "Error installing $appPath/$CLIInstaller $CLIArguments error:\n$logoutput" #ERROR + else + printlog "Succesfully ran $appPath/$CLIInstaller $CLIArguments" fi - printlog "Debugging enabled, update tool output was: $logoutput" #DEBUG + printlog "Debugging enabled, update tool output was:\n$logoutput" #DEBUG fi } diff --git a/fragments/labels/adobecreativeclouddesktop.sh b/fragments/labels/adobecreativeclouddesktop.sh index 30b11e2..8388161 100644 --- a/fragments/labels/adobecreativeclouddesktop.sh +++ b/fragments/labels/adobecreativeclouddesktop.sh @@ -9,7 +9,7 @@ adobecreativeclouddesktop) 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" + CLIInstaller="Contents/MacOS/Install" # "Install.app/Contents/MacOS/Install" CLIArguments=(--mode=silent) expectedTeamID="JQ525L2MZD" Company="Adobe"