From 8b19773a7fa249fa37d39193b3e9646d4cf8efc6 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 10:38:58 +0200
Subject: [PATCH] Correcting logging

---
 .../App VFA SS github.sh                                      | 4 +---
 .../App VFA SS.sh                                             | 4 +---
 .../App browser-security SS.sh                                | 4 +---
 .../App normal SS multi-app.sh                                | 4 +---
 .../App normal SS.sh                                          | 4 +---
 .../App service SS.sh                                         | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

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 ec42027..0130d46 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,9 +134,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
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 ed36def..57a08db 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,9 +81,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
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 3efdfdd..7bddd7f 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,9 +72,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
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 ce2d5f9..72c674c 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,9 +72,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
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 49d374f..0cf925c 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,9 +69,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
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 40aeb18..6d9ca83 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,9 +72,7 @@ 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."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"