From bf4e7d89ec459b528c3ea0fdc75fc2526ad313f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 10 Nov 2021 16:01:06 +0100 Subject: [PATCH] mountname reintroduced MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now we can call any script on the root of the path where `appName` is found. Same result: ``` 2021-11-10 15:58:02 adobecreativeclouddesktop setting variable from argument DEBUG=0 2021-11-10 15:58:02 adobecreativeclouddesktop setting variable from argument INSTALL=force 2021-11-10 15:58:02 adobecreativeclouddesktop ################## Start Installomator v. 0.8.0 2021-11-10 15:58:02 adobecreativeclouddesktop ################## adobecreativeclouddesktop 2021-11-10 15:58:03 adobecreativeclouddesktop BLOCKING_PROCESS_ACTION=tell_user 2021-11-10 15:58:03 adobecreativeclouddesktop NOTIFY=success 2021-11-10 15:58:03 adobecreativeclouddesktop LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2021-11-10 15:58:03 adobecreativeclouddesktop no blocking processes defined, using Creative Cloud as default 2021-11-10 15:58:03 adobecreativeclouddesktop Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.WNV7B1pH 2021-11-10 15:58:03 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 15:58:03 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 15:58:03 adobecreativeclouddesktop appversion: 2021-11-10 15:58:03 adobecreativeclouddesktop Latest version of Creative Cloud is 5.6.0.788 2021-11-10 15:58:03 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 15:58:17 adobecreativeclouddesktop no more blocking processes, continue with update 2021-11-10 15:58:17 adobecreativeclouddesktop Installing Creative Cloud 2021-11-10 15:58:17 adobecreativeclouddesktop Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.WNV7B1pH/Creative Cloud.dmg 2021-11-10 15:58:18 adobecreativeclouddesktop Mounted: /Volumes/Creative Cloud 2021-11-10 15:58:18 adobecreativeclouddesktop Verifying: /Volumes/Creative Cloud/Install.app 2021-11-10 15:58:18 adobecreativeclouddesktop Team ID matching: JQ525L2MZD (expected: JQ525L2MZD ) 2021-11-10 15:58:18 adobecreativeclouddesktop Downloaded version of Creative Cloud is 2.6.0.46 (replacing version ). 2021-11-10 15:58:18 adobecreativeclouddesktop CLIInstaller exists, running installer command /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install --mode=silent 2021-11-10 15:58:23 adobecreativeclouddesktop Succesfully ran /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install --mode=silent 2021-11-10 15:58:23 adobecreativeclouddesktop Debugging enabled, update tool output was: objc[20055]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102565018) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10f2f0790). One of the two will be used. Which one is undefined. objc[20055]: Class ProxyManager is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102565068) and /Library/Application Support/Adobe/Adobe Desktop Common/Core/AdobePIM.dylib (0x10f2f07e0). One of the two will be used. Which one is undefined. objc[20055]: Class HTTPHeader is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102565018) and /Volumes/Creative Cloud/resources/AdobePIM.dylib (0x110302790). One of the two will be used. Which one is undefined. objc[20055]: Class ProxyManager is implemented in both /Volumes/Creative Cloud/Install.app/Contents/MacOS/Install (0x102565068) and /Volumes/Creative Cloud/resources/AdobePIM.dylib (0x1103027e0). One of the two will be used. Which one is undefined. Starting installer... Installation successful. 2021-11-10 15:58:23 adobecreativeclouddesktop Finishing… 2021-11-10 15:58:33 adobecreativeclouddesktop App(s) found: /Library/Application Support/Adobe/Adobe Desktop Common/HDBox/Install.app 2021-11-10 15:58:33 adobecreativeclouddesktop could not determine location of Install.app 2021-11-10 15:58:33 adobecreativeclouddesktop Installed Creative Cloud 2021-11-10 15:58:33 adobecreativeclouddesktop notifying 2021-11-10 15:58:33 adobecreativeclouddesktop Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.WNV7B1pH 2021-11-10 15:58:33 adobecreativeclouddesktop Unmounting /Volumes/Creative Cloud "disk5" ejected. 2021-11-10 15:58:33 adobecreativeclouddesktop App not closed, so no reopen. 2021-11-10 15:58:33 adobecreativeclouddesktop ################## End Installomator, exit code 0 ``` --- fragments/functions.sh | 10 +++++----- fragments/labels/adobecreativeclouddesktop.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fragments/functions.sh b/fragments/functions.sh index 0a47499..ac6ab82 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -393,17 +393,17 @@ installAppWithPath() { # $1: path to app to install in $targetDir fi elif [[ ! -z $CLIInstaller ]]; then - #mountname=$(dirname $appPath) - printlog "CLIInstaller exists, running installer command $appPath/$CLIInstaller $CLIArguments" #INFO + mountname=$(dirname $appPath) + printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" #INFO - CLIoutput=$("$appPath/$CLIInstaller" "${CLIArguments[@]}" 2>&1) + CLIoutput=$("$mountname/$CLIInstaller" "${CLIArguments[@]}" 2>&1) CLIstatus=$(echo $?) logoutput="$CLIoutput" # dedupliatelogs "$CLIoutput" if [ $CLIstatus -ne 0 ] ; then - cleanupAndExit 3 "Error installing $appPath/$CLIInstaller $CLIArguments error:\n$logoutput" #ERROR + cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" #ERROR else - printlog "Succesfully ran $appPath/$CLIInstaller $CLIArguments" + printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments" fi printlog "Debugging enabled, update tool output was:\n$logoutput" #DEBUG fi diff --git a/fragments/labels/adobecreativeclouddesktop.sh b/fragments/labels/adobecreativeclouddesktop.sh index 8388161..30b11e2 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="Contents/MacOS/Install" # "Install.app/Contents/MacOS/Install" + CLIInstaller="Install.app/Contents/MacOS/Install" CLIArguments=(--mode=silent) expectedTeamID="JQ525L2MZD" Company="Adobe"