Bug fixes to dw_pat and dw_aprs GUI scripts

dw_aprs_gui.sh

@@ -16,7 +16,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.0.4
+#-    version         ${SCRIPT_NAME} 1.0.5
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -46,12 +46,13 @@ Optnum=$#
 function TrapCleanup() {
    [[ -d "${TMPDIR}" ]] && rm -rf "${TMPDIR}/"
    #pkill "^direwolf"
-   kill $timeStamp_PID >/dev/null 2>&1
+   #kill $timeStamp_PID >/dev/null 2>&1
    kill $direwolf_PID >/dev/null 2>&1
    for P in ${YAD_PIDs[@]}
 	do
 		kill $P >/dev/null 2>&1
 	done
+	echo "quit" >&6
 	rm -f $PIPE
 }
 
@@ -300,21 +301,22 @@ EOF
 
 }
 
-function timeStamp () {
-	while sleep 60
-	do
-		echo -e "\nTIMESTAMP: $(date)" 
-	done >$PIPEDATA
-}
+#function timeStamp () {
+#   exec 6<> $PIPEDATA
+#	while sleep 60
+#	do
+#		echo -e "\nTIMESTAMP: $(date)" 
+#	done >&6
+#}
 
 function killDirewolf () {
 	# $1 is the direwolf PID
    if pgrep ^direwolf | grep -q $1 2>/dev/null
 	then
 		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
-		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
 }
 
@@ -452,7 +454,7 @@ fi
 export -f setDefaults loadAPRSDefaults killDirewolf
 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 PIPEDATA=$PIPE
+#export PIPEDATA=$PIPE
 
 #============================
 #  MAIN SCRIPT
@@ -462,7 +464,7 @@ export PIPEDATA=$PIPE
 trap SafeExit EXIT INT TERM SIGINT
 
 # 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
 $SYNTAX && set -n
@@ -483,7 +485,8 @@ do
 
 	# Kill any running processes and load latest settings
 	killDirewolf $direwolf_PID
-   for P in ${YAD_PIDs[@]} $timeStamp_PID
+#   for P in ${YAD_PIDs[@]} $timeStamp_PID
+   for P in ${YAD_PIDs[@]}
 	do
 		ps x | egrep -q "^$P" && kill $P
 	done
@@ -493,10 +496,6 @@ do
 	loadSettings $CONFIG_FILE
 	YAD_PIDs=()
 	
-   # Start the Time Stamper function
-	timeStamp &
-   timeStamp_PID=$!
-
 	# Start the monitor tab
 	[[ $FIRST_RUN == true ]] && MODE_MESSAGE="" || MODE_MESSAGE="${F[_APRSMODE_]}"
 	TEXT="<big><b>Direwolf $MODE_MESSAGE APRS Monitor</b></big>"
@@ -506,6 +505,10 @@ do
 		--tail --center <&6 &
 	YAD_PIDs+=( $! )
 
+   # Start the Time Stamper function
+	#timeStamp &
+   #timeStamp_PID=$!
+
 	if [[ $FIRST_RUN == true ]]
 	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

dw_pat_gui.sh

@@ -15,7 +15,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.6.6
+#-    version         ${SCRIPT_NAME} 1.6.7
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -50,7 +50,7 @@ Optnum=$#
 
 function TrapCleanup() {
    [[ -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 $pat_PID >/dev/null 2>&1
 	kill $RIG_PID >/dev/null 2>&1
@@ -208,21 +208,21 @@ EOF
 	PAT_LOCATOR="$(jq -r ".locator" $PAT_CONFIG)"
 }
 
-function timeStamp () {
-	while sleep 60
-	do
-		echo -e "\nTIMESTAMP: $(date)" 
-	done >$PIPEDATA
-}
+#function timeStamp () {
+#	while sleep 60
+#	do
+#		echo -e "\nTIMESTAMP: $(date)" 
+#	done >$PIPEDATA
+#}
 
 function killDirewolf () {
 	# $1 is the direwolf PID
    if pgrep ^direwolf | grep -q $1 2>/dev/null
 	then
 		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
-		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
 }
 
@@ -388,7 +388,7 @@ cat $PAT_CONFIG | jq --arg R "network" '.ax25.rig = $R' | sponge $PAT_CONFIG
 export -f 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 PIPEDATA=$PIPE
+#export PIPEDATA=$PIPE
 
 #============================
 #  MAIN SCRIPT
@@ -398,15 +398,15 @@ export PIPEDATA=$PIPE
 trap SafeExit EXIT INT TERM
 
 # 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
 $SYNTAX && set -n
 # Run in debug mode, if set
 $DEBUG && set -x 
 
-timeStamp &
-timeStamp_PID=$!
+#timeStamp &
+#timeStamp_PID=$!
 
 direwolf_PID=""
 pat_PID=""

hampi-utilities.version

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