v/nexus-utilities
1
0
Fork 0
mirror of https://github.com/AG7GN/nexus-utilities.git synced 2025-05-20 00:10:11 -07:00
Code Issues Projects Releases Wiki Activity

Fixed bug in dw_aprs_gui.sh that prevented script from restarting

Browse Source
This commit is contained in:
Steve Magnuson 2020-07-14 19:53:38 -07:00
parent 6e96efd663
commit 0907f54e81
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dw_aprs_gui.sh
View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.0.1 #- version ${SCRIPT_NAME} 1.0.3
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -350,10 +350,6 @@ CONFIG_TAB_TEXT="<b><big><big>Direwolf APRS Configuration</big></big></b>\n \
ID="${RANDOM}" ID="${RANDOM}"
RETURN_CODE=0 RETURN_CODE=0
# Have direwolf allocate a pty
#DIREWOLF="$(command -v direwolf) -p -t 0 -d u"
# No pty
DIREWOLF="$(command -v direwolf) -t 0 -d u"
PIPE=$TMPDIR/pipe PIPE=$TMPDIR/pipe
mkfifo $PIPE mkfifo $PIPE
@ -473,23 +469,33 @@ $SYNTAX && set -n
# Run in debug mode, if set # Run in debug mode, if set
$DEBUG && set -x $DEBUG && set -x
timeStamp & timeStamp_PID=""
timeStamp_PID=$!
direwolf_PID="" direwolf_PID=""
YAD_PIDs=() YAD_PIDs=()
while true while true
do do
# Have direwolf allocate a pty
#DIREWOLF="$(command -v direwolf) -p -t 0 -d u"
# No pty
DIREWOLF="$(command -v direwolf) -t 0 -d u"
# Kill any running processes and load latest settings # Kill any running processes and load latest settings
killDirewolf $direwolf_PID killDirewolf $direwolf_PID
for P in ${YAD_PIDs[@]} for P in ${YAD_PIDs[@]} $timeStamp_PID
do do
ps x | egrep -q "^$P" && kill $P ps x | egrep -q "^$P" && kill $P
done done
rm -f $TMPDIR/CONFIGURE_APRS.txt rm -f $TMPDIR/CONFIGURE_APRS.txt
# Retrieve saved settings or defaults if there are no saved settings
loadSettings $CONFIG_FILE loadSettings $CONFIG_FILE
YAD_PIDs=() YAD_PIDs=()
# Start the Time Stamper function
timeStamp &
timeStamp_PID=$!
# Start the monitor tab # Start the monitor tab
[[ $FIRST_RUN == true ]] && MODE_MESSAGE="" || MODE_MESSAGE="${F[_APRSMODE_]}" [[ $FIRST_RUN == true ]] && MODE_MESSAGE="" || MODE_MESSAGE="${F[_APRSMODE_]}"

2
hampi-utilities.version
View File

@ -1 +1 @@
VERSION="2.3.3" VERSION="2.3.4"