diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh index a235945..ec42027 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh @@ -134,8 +134,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -177,8 +179,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent" 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 2089f9b..ed36def 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 @@ -81,8 +81,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -124,8 +126,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent" diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh index 8e59aba..3efdfdd 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh @@ -72,8 +72,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -115,8 +117,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent" diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh index 0cc2af9..ce2d5f9 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh @@ -72,8 +72,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -115,8 +117,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent" diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh index 77f7add..49d374f 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh @@ -69,8 +69,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -112,8 +114,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent" diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh index 67d1f56..40aeb18 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh @@ -72,8 +72,10 @@ checkCmdOutput () { exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" if [[ ${exitStatus} -eq 0 ]] ; then echo "${item} succesfully installed." - warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )" - echo "$warnOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )" + echo "$selectedOutput" + selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )" + echo "$selectedOutput" else echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "$cmdOutput" @@ -115,8 +117,9 @@ caffexit () { installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)" if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then - echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion." - echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)." + echo "Skipping swiftDialog UI, using notifications." + #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion." + #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)." installomatorNotify="NOTIFY=all" else installomatorNotify="NOTIFY=silent"