From fd1c948e44c0860af3252a5581ffc27b9941a5cd Mon Sep 17 00:00:00 2001 From: wattsy74 <49881777+wattsy74@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:25:08 +0100 Subject: [PATCH] Update microsoft-apps.sh --- microsoft-apps.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/microsoft-apps.sh b/microsoft-apps.sh index 906a7db..b5c5031 100644 --- a/microsoft-apps.sh +++ b/microsoft-apps.sh @@ -69,6 +69,13 @@ function install_software () { OPEN_CONSOLE=$4 VERSION=$(echo "${LATEST_XML}" | xmllint --xpath '//latest/package[id="'${SOFTWARE_ID}'"]/cfbundleversion/text()' -) +echo "Script version: ${scriptver}" >> "${logfile}" +echo "Script version: ${scriptver}" >> ${deplog} + +if [[ ${OPEN_CONSOLE} == "openconsole" ]]; then + open ${logfile} + open ${deplog} +fi if [[ ${SOFTWARE_LOCATION} != "SUITE" ]]; then @@ -150,13 +157,7 @@ logfile="/tmp/OfficeInstallScript.log" scriptver="3.2" echo ${logfile} echo ${scriptver} -echo "Script version: ${scriptver}" >> "${logfile}" -echo "Script version: ${scriptver}" >> ${deplog} - -if [[ ${OPEN_CONSOLE} == "openconsole" ]]; then - open ${logfile} - open ${deplog} -fi + # Main