From 9d7e463737bc4df74db05e1c8ce9ebcd8a3e9aef Mon Sep 17 00:00:00 2001
From: Fred Clausen <43556888+fredclausen@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:59:04 -0700
Subject: [PATCH] appname to basename

---
 rootfs/etc/s6-overlay/scripts/mlat-client | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rootfs/etc/s6-overlay/scripts/mlat-client b/rootfs/etc/s6-overlay/scripts/mlat-client
index 0a8a9fb..79a4c52 100755
--- a/rootfs/etc/s6-overlay/scripts/mlat-client
+++ b/rootfs/etc/s6-overlay/scripts/mlat-client
@@ -211,12 +211,12 @@ do
     # run this Mlat_client instance in the background:
     #shellcheck disable=SC2069,SC2086
     if [[ -z "${LOGLEVEL}" ]] || [[ "${LOGLEVEL,,}" == "verbose" ]]; then
-        "${s6wrap[@]}" --prepend="${APPNAME}][${servername}" --args echo "starting: ${MLAT_CMD} ${MLAT_PARAM[*]}"
-        "${s6wrap[@]}" --prepend="${APPNAME}][${servername}" --args ${execstring} &
+        "${s6wrap[@]}" --prepend="$(basename "$0")][${servername}" --args echo "starting: ${MLAT_CMD} ${MLAT_PARAM[*]}"
+        "${s6wrap[@]}" --prepend="$(basename "$0")][${servername}" --args ${execstring} &
     elif [[ "${LOGLEVEL,,}" == "error" ]]; then
-        "${s6wrap[@]}" --ignore-stdout --prepend="${APPNAME}][${servername}" --args ${execstring} &
+        "${s6wrap[@]}" --ignore-stdout --prepend="$(basename "$0")][${servername}" --args ${execstring} &
     elif [[ "${LOGLEVEL,,}" == "none" ]]; then
-        "${s6wrap[@]}" --ignore-stderr --ignore-stdout --prepend="${APPNAME}][${servername}" --args ${execstring} &
+        "${s6wrap[@]}" --ignore-stderr --ignore-stdout --prepend="$(basename "$0")][${servername}" --args ${execstring} &
     fi
 
     # pid_array is indexed by the PID of each mlat_client and contains the MLAT_PARAMs for that instance
@@ -242,17 +242,17 @@ do
             servername="$(awk '{print $4}' <<< "${pid_array[$mlat_pid]}")"
             servername="${servername%%:*}"
 
-            [[ "${LOGLEVEL,,}" != "none" ]] && "${s6wrap[@]}" --prepend="${APPNAME}[${servername}" --args echo "MLAT_Client ${servername} exited. Attempting to restart." || true
+            [[ "${LOGLEVEL,,}" != "none" ]] && "${s6wrap[@]}" --prepend="$(basename "$0")[${servername}" --args echo "MLAT_Client ${servername} exited. Attempting to restart." || true
             # shellcheck disable=SC2086
             execstring="$(echo ${MLAT_CMD} ${pid_array[$mlat_pid]} | xargs)"
 
             #shellcheck disable=SC2069,SC2086
             if [[ -z "${LOGLEVEL}" ]] || [[ "${LOGLEVEL,,}" == "verbose" ]]; then
-                "${s6wrap[@]}" --prepend="${APPNAME}][${servername}" --args ${execstring} &
+                "${s6wrap[@]}" --prepend="$(basename "$0")][${servername}" --args ${execstring} &
             elif [[ "${LOGLEVEL,,}" == "error" ]]; then
-                "${s6wrap[@]}" --ignore-stdout --prepend="${APPNAME}][${servername}" --args ${execstring} &
+                "${s6wrap[@]}" --ignore-stdout --prepend="$(basename "$0")][${servername}" --args ${execstring} &
             elif [[ "${LOGLEVEL,,}" == "none" ]]; then
-                "${s6wrap[@]}" --ignore-stderr --ignore-stdout --prepend="${APPNAME}][${servername}" --args ${execstring} &
+                "${s6wrap[@]}" --ignore-stderr --ignore-stdout --prepend="$(basename "$0")][${servername}" --args ${execstring} &
             fi
 
             pid_array[$!]="${pid_array[${mlat_pid}]}"