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

Bug fixes to dw_pat and dw_aprs GUI scripts

Browse Source
This commit is contained in:
Steve Magnuson 2020-08-24 17:37:24 -07:00
parent 329de69e4e
commit 337f3f759d
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dw_aprs_gui.sh
View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.0.4 #- version ${SCRIPT_NAME} 1.0.5
#- 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
@ -46,12 +46,13 @@ Optnum=$#
function TrapCleanup() { function TrapCleanup() {
[[ -d "${TMPDIR}" ]] && rm -rf "${TMPDIR}/" [[ -d "${TMPDIR}" ]] && rm -rf "${TMPDIR}/"
#pkill "^direwolf" #pkill "^direwolf"
kill $timeStamp_PID >/dev/null 2>&1 #kill $timeStamp_PID >/dev/null 2>&1
kill $direwolf_PID >/dev/null 2>&1 kill $direwolf_PID >/dev/null 2>&1
for P in ${YAD_PIDs[@]} for P in ${YAD_PIDs[@]}
do do
kill $P >/dev/null 2>&1 kill $P >/dev/null 2>&1
done done
echo "quit" >&6
rm -f $PIPE rm -f $PIPE
} }
@ -300,21 +301,22 @@ EOF
} }
function timeStamp () { #function timeStamp () {
while sleep 60 # exec 6<> $PIPEDATA
do # while sleep 60
echo -e "\nTIMESTAMP: $(date)" # do
done >$PIPEDATA # echo -e "\nTIMESTAMP: $(date)"
} # done >&6
#}
function killDirewolf () { function killDirewolf () {
# $1 is the direwolf PID # $1 is the direwolf PID
if pgrep ^direwolf | grep -q $1 2>/dev/null if pgrep ^direwolf | grep -q $1 2>/dev/null
then then
kill $1 >/dev/null 2>&1 kill $1 >/dev/null 2>&1
echo -e "\n\nDirewolf stopped. Click \"Restart...\" button below to restart." >$PIPEDATA echo -e "\n\nDirewolf stopped. Click \"Restart...\" button below to restart." >&6
else else
echo -e "\n\nDirewolf was already stopped. Click \"Restart...\" button below to restart." >$PIPEDATA echo -e "\n\nDirewolf was already stopped. Click \"Restart...\" button below to restart." >&6
fi fi
} }
@ -452,7 +454,7 @@ fi
export -f setDefaults loadAPRSDefaults killDirewolf export -f setDefaults loadAPRSDefaults killDirewolf
export load_aprs_defaults_cmd='@bash -c "setDefaults; loadAPRSDefaults"' export load_aprs_defaults_cmd='@bash -c "setDefaults; loadAPRSDefaults"'
export click_aprs_help_cmd='bash -c "xdg-open /usr/local/share/hampi/aprs_help.html"' export click_aprs_help_cmd='bash -c "xdg-open /usr/local/share/hampi/aprs_help.html"'
export PIPEDATA=$PIPE #export PIPEDATA=$PIPE
#============================ #============================
# MAIN SCRIPT # MAIN SCRIPT
@ -462,7 +464,7 @@ export PIPEDATA=$PIPE
trap SafeExit EXIT INT TERM SIGINT trap SafeExit EXIT INT TERM SIGINT
# Exit on error. Append '||true' when you run the script if you expect an error. # Exit on error. Append '||true' when you run the script if you expect an error.
set -o errexit #set -o errexit
# Check Syntax if set # Check Syntax if set
$SYNTAX && set -n $SYNTAX && set -n
@ -483,7 +485,8 @@ do
# 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[@]} $timeStamp_PID # for P in ${YAD_PIDs[@]} $timeStamp_PID
for P in ${YAD_PIDs[@]}
do do
ps x | egrep -q "^$P" && kill $P ps x | egrep -q "^$P" && kill $P
done done
@ -493,10 +496,6 @@ do
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_]}"
TEXT="<big><b>Direwolf $MODE_MESSAGE APRS Monitor</b></big>" TEXT="<big><b>Direwolf $MODE_MESSAGE APRS Monitor</b></big>"
@ -506,6 +505,10 @@ do
--tail --center <&6 & --tail --center <&6 &
YAD_PIDs+=( $! ) YAD_PIDs+=( $! )
# Start the Time Stamper function
#timeStamp &
#timeStamp_PID=$!
if [[ $FIRST_RUN == true ]] if [[ $FIRST_RUN == true ]]
then then
echo -e "\n\nDirewolf was not started because APRS is not configured.\nConfigure it in the \"Configure APRS\" tab, then click the \"Restart...\" button below." >&6 echo -e "\n\nDirewolf was not started because APRS is not configured.\nConfigure it in the \"Configure APRS\" tab, then click the \"Restart...\" button below." >&6

28
dw_pat_gui.sh
View File

@ -15,7 +15,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.6.6 #- version ${SCRIPT_NAME} 1.6.7
#- 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
@ -50,7 +50,7 @@ Optnum=$#
function TrapCleanup() { function TrapCleanup() {
[[ -d "${TMPDIR}" ]] && rm -rf "${TMPDIR}/" [[ -d "${TMPDIR}" ]] && rm -rf "${TMPDIR}/"
kill $timeStamp_PID >/dev/null 2>&1 #kill $timeStamp_PID >/dev/null 2>&1
kill $direwolf_PID >/dev/null 2>&1 kill $direwolf_PID >/dev/null 2>&1
kill $pat_PID >/dev/null 2>&1 kill $pat_PID >/dev/null 2>&1
kill $RIG_PID >/dev/null 2>&1 kill $RIG_PID >/dev/null 2>&1
@ -208,21 +208,21 @@ EOF
PAT_LOCATOR="$(jq -r ".locator" $PAT_CONFIG)" PAT_LOCATOR="$(jq -r ".locator" $PAT_CONFIG)"
} }
function timeStamp () { #function timeStamp () {
while sleep 60 # while sleep 60
do # do
echo -e "\nTIMESTAMP: $(date)" # echo -e "\nTIMESTAMP: $(date)"
done >$PIPEDATA # done >$PIPEDATA
} #}
function killDirewolf () { function killDirewolf () {
# $1 is the direwolf PID # $1 is the direwolf PID
if pgrep ^direwolf | grep -q $1 2>/dev/null if pgrep ^direwolf | grep -q $1 2>/dev/null
then then
kill $1 >/dev/null 2>&1 kill $1 >/dev/null 2>&1
echo -e "\n\nDirewolf stopped. Click \"Save Settings...\" button below to restart." >$PIPEDATA echo -e "\n\nDirewolf stopped. Click \"Save Settings...\" button below to restart." >&3
else else
echo -e "\n\nDirewolf was already stopped. Click \"Save Settings...\" button below to restart." >$PIPEDATA echo -e "\n\nDirewolf was already stopped. Click \"Save Settings...\" button below to restart." >&3
fi fi
} }
@ -388,7 +388,7 @@ cat $PAT_CONFIG | jq --arg R "network" '.ax25.rig = $R' | sponge $PAT_CONFIG
export -f setTNCpatDefaults loadpatDefaults export -f setTNCpatDefaults loadpatDefaults
export load_pat_defaults_cmd='@bash -c "setTNCpatDefaults; loadpatDefaults"' export load_pat_defaults_cmd='@bash -c "setTNCpatDefaults; loadpatDefaults"'
export click_dw_pat_help_cmd='bash -c "xdg-open /usr/local/share/hampi/dw_pat_gui_help.html"' export click_dw_pat_help_cmd='bash -c "xdg-open /usr/local/share/hampi/dw_pat_gui_help.html"'
export PIPEDATA=$PIPE #export PIPEDATA=$PIPE
#============================ #============================
# MAIN SCRIPT # MAIN SCRIPT
@ -398,15 +398,15 @@ export PIPEDATA=$PIPE
trap SafeExit EXIT INT TERM trap SafeExit EXIT INT TERM
# Exit on error. Append '||true' when you run the script if you expect an error. # Exit on error. Append '||true' when you run the script if you expect an error.
set -o errexit #set -o errexit
# Check Syntax if set # Check Syntax if set
$SYNTAX && set -n $SYNTAX && set -n
# Run in debug mode, if set # Run in debug mode, if set
$DEBUG && set -x $DEBUG && set -x
timeStamp & #timeStamp &
timeStamp_PID=$! #timeStamp_PID=$!
direwolf_PID="" direwolf_PID=""
pat_PID="" pat_PID=""

2
hampi-utilities.version
View File

@ -1 +1 @@
VERSION="2.3.15" VERSION="2.3.16"