From e36ff184a4e812120a24404b6eca29d9e9b6e382 Mon Sep 17 00:00:00 2001 From: Eric Claeys <83164203+EricClaeys@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:36:47 -0600 Subject: [PATCH] Update makeChanges.sh: Pass --fromWebUI to postToMap.sh when appropriate --- scripts/makeChanges.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/makeChanges.sh b/scripts/makeChanges.sh index 740d8306e..f23c50f6a 100755 --- a/scripts/makeChanges.sh +++ b/scripts/makeChanges.sh @@ -73,7 +73,8 @@ while [[ $# -gt 0 ]]; do shift done -if [[ ${ON_TTY} == "false" ]]; then # called from WebUI. +if [[ ${ON_TTY} == "false" ]]; then + FROM_WEBUI="--fromWebUI" # The WebUI will display our output in an # appropriate style if ERROR: or WARNING: is in the message, so # don't provide our own format. @@ -84,6 +85,7 @@ if [[ ${ON_TTY} == "false" ]]; then # called from WebUI. wNC="" BR="
" else + FROM_WEBUI="" ERROR_PREFIX="${ME}: " BR="\n" fi @@ -888,7 +890,7 @@ if [[ ${RUN_POSTTOMAP} == "true" ]]; then [[ ${DEBUG} == "true" ]] && echo -e "${wDEBUG}Executing postToMap.sh${wNC}" # TODO: put in background to return to user faster? # shellcheck disable=SC2086 - "${ALLSKY_SCRIPTS}/postToMap.sh" --whisper --force ${DEBUG_ARG} ${POSTTOMAP_ACTION} + "${ALLSKY_SCRIPTS}/postToMap.sh" --whisper --force ${DEBUG_ARG} ${FROM_WEBUI} ${POSTTOMAP_ACTION} fi fi