diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh index e6dc82b..2089f9b 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh @@ -103,8 +103,7 @@ uid=$(id -u "$currentUser") userHome="$(dscl . -read /users/${currentUser} NFSHomeDirectory | awk '{print $2}')" # Verify that Installomator has been installed -#destFile="/usr/local/Installomator/Installomator.sh" -destFile="/usr/local/Installomator/Installomator10.sh" +destFile="/usr/local/Installomator/Installomator.sh" if [ ! -e "${destFile}" ]; then echo "Installomator not found here:" echo "${destFile}" diff --git a/MDM/App-install/App VFA.sh b/MDM/App-install/App VFA.sh index 1772419..beca08c 100755 --- a/MDM/App-install/App VFA.sh +++ b/MDM/App-install/App VFA.sh @@ -10,8 +10,10 @@ LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1" # Variables for label name="ClickShare" type="appInDmgInZip" +packageID="" downloadURL="https://www.barco.com$( curl -fs "https://www.barco.com/en/clickshare/app" | grep -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )" appNewVersion="$(eval "$( echo $downloadURL | sed -E 's/.*(MajorVersion.*BuildVersion=[0-9]*).*/\1/' | sed 's/&//g' )" ; ((MajorVersion++)) ; ((MajorVersion--)); ((MinorVersion++)) ; ((MinorVersion--)); ((PatchVersion++)) ; ((PatchVersion--)); ((BuildVersion++)) ; ((BuildVersion--)); echo "${MajorVersion}.${MinorVersion}.${PatchVersion}-b${BuildVersion}")" +versionKey="" expectedTeamID="P6CDJZR997" installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user LOGGING=INFO NOTIFY=all" # Separated by space @@ -67,11 +69,14 @@ caffexit () { # Install software using Installomator with valuesfromarguments cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \ - name=${name} \ + name=\"${name}\" \ type=${type} \ + packageID=${packageID} \ downloadURL=\"$downloadURL\" \ appNewVersion=${appNewVersion} \ + versionKey=${versionKey} \ expectedTeamID=${expectedTeamID} \ + blockingProcesses=\"NONE\" \ ${installomatorOptions} || true)" diff --git a/MDM/App-install/App service Auto-install.sh b/MDM/App-install/App service Auto-install.sh index 0f5b5f1..a79358d 100644 --- a/MDM/App-install/App service Auto-install.sh +++ b/MDM/App-install/App service Auto-install.sh @@ -2,7 +2,7 @@ # Installation using Installomator -LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1" +LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1" what="dockutil" # enter the software to install # Examples: adobecreativeclouddesktop, textmate, vlc