From a3588f35403fb28faf175b4cd37f8957dcb52d01 Mon Sep 17 00:00:00 2001
From: Yaro Kasear <git@kasear.net>
Date: Fri, 2 May 2025 13:54:29 -0500
Subject: [PATCH] Refactor listener output file handling in runtest.sh for
 improved clarity and reliability

---
 runtest.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/runtest.sh b/runtest.sh
index ae596e2..b9d1de8 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -51,6 +51,11 @@ source settings.env
 # (redefine BOOT_ID, TEST_FILE, etc after reloading settings.env if needed)
 BOOT_ID=$(cat /proc/sys/kernel/random/boot_id)
 TEST_FILE="${HOME}/${BOOT_ID}-speedtest.csv"
+if [ "$LISTENER_ENABLED" -eq 1 ]; then
+  LISTENER_OUTFILE="${TEST_FILE%.csv}-listener.csv"
+else
+  LISTENER_OUTFILE=""
+fi
 ENRICHED_FILE="${TEST_FILE%.csv}+rf.csv"
 SSID_METRICS_FILE="${ENRICHED_FILE%.csv}-ssid-metrics.csv"
 FAILURE_LOG="${TEST_FILE%.csv}-failures.log"
@@ -271,9 +276,7 @@ ATTACHMENTS=()
 [ -f "$ENRICHED_FILE" ] && ATTACHMENTS+=("$ENRICHED_FILE")
 [ -f "$FAILURE_LOG" ] && ATTACHMENTS+=("$FAILURE_LOG")
 [ -f "$SSID_METRICS_FILE" ] && ATTACHMENTS+=("$SSID_METRICS_FILE")
-if [ "$LISTENER_ENABLED" -eq 1 ] && [ -f "$LISTENER_OUTFILE" ]; then
-  ATTACHMENTS+=("$LISTENER_OUTFILE")
-fi
+[ -n "$LISTENER_OUTFILE" ] && [ -f "$LISTENER_OUTFILE" ] && ATTACHMENTS+=("$LISTENER_OUTFILE")
 
 if [ ${#ATTACHMENTS[@]} -eq 0 ]; then
   warn "No files to attach. Email not sent."