Refactor listener output file handling in runtest.sh for improved clarity and reliability

This commit is contained in:
Yaro Kasear 2025-05-02 13:54:29 -05:00
parent 8ce492a8b9
commit a3588f3540

View file

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