From 61a138a153f86c482e8a91aaa6136b24a12c839d Mon Sep 17 00:00:00 2001 From: Stacy Harper Date: Tue, 27 Jul 2021 09:09:36 +0200 Subject: [PATCH] Fix remaining issue with states cause of dangling event files We also have to remove them on outgoing call. We use find instead of rm with a wildcard cause wildcard look not expanded here. Signed-off-by: Stacy Harper Signed-off-by: Maarten van Gompel --- scripts/modem/sxmo_modemdial.sh | 5 +++++ scripts/modem/sxmo_modemmonitor.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/modem/sxmo_modemdial.sh b/scripts/modem/sxmo_modemdial.sh index 9ace65d..897e0a1 100755 --- a/scripts/modem/sxmo_modemdial.sh +++ b/scripts/modem/sxmo_modemdial.sh @@ -1,6 +1,10 @@ #!/usr/bin/env sh trap "gracefulexit" INT TERM +# include common definitions +# shellcheck source=scripts/core/sxmo_common.sh +. "$(dirname "$0")/sxmo_common.sh" + fatalerr() { # E.g. hangup all calls, switch back to default audio, notify user, and die mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all @@ -49,6 +53,7 @@ dialmenu() { grep -Eo "Call/[0-9]+" | grep -oE "[0-9]+" )" + find "$CACHEDIR" -name "$CALLID.*" -delete # we cleanup all dangling event files echo "Starting call with CALLID: $CALLID" >&2 echo "$CALLID" } diff --git a/scripts/modem/sxmo_modemmonitor.sh b/scripts/modem/sxmo_modemmonitor.sh index 884f4e1..98dd6c4 100755 --- a/scripts/modem/sxmo_modemmonitor.sh +++ b/scripts/modem/sxmo_modemmonitor.sh @@ -150,7 +150,7 @@ checkforincomingcalls() { [ -z "$VOICECALLID" ] && return [ -f "$CACHEDIR/${VOICECALLID}.monitoredcall" ] && return # prevent multiple rings - rm -f "$CACHEDIR/${VOICECALLID}.*" # we cleanup all dangling event files + find "$CACHEDIR" -name "$VOICECALLID.*" -delete # we cleanup all dangling event files touch "$CACHEDIR/${VOICECALLID}.monitoredcall" #this signals that we handled the call cat "$LASTSTATE" > "$CACHEDIR/${VOICECALLID}.laststate"