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"