Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't stop rigctld if it was started separate from FreeDATA

Browse source
This commit is contained in:
Dj Merrill 2024-05-05 17:40:32 -04:00
parent 3afdbdbd8e
commit 68b50f3ff0
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tools/Linux/run-freedata-linux.sh
View file

@ -15,6 +15,9 @@
# We expect the config.ini file to be at $HOME/.config/FreeDATA/config.ini
# If it isn't found, we copy config.ini.example there
#
# 1.6: 05 May 2024
# Don't stop rigctld if it was started separate from FreeDATA
# We only want to clean up FreeDATA initiated processes
# 1.5: 05 May 2024
# Check for rigctld at exit and stop it if needed
# 1.4: 05 May 2024
@ -52,6 +55,11 @@ then
sleep 7s
fi
# Check for an already running rigctld process
# This was probably started by other means so we should leave this
# alone when we exit
checkrigexist=`ps auxw | grep -i rigctld | grep -v grep`
echo "*************************************************************************"
echo "Running the FreeDATA server component"
echo "*************************************************************************"
@ -122,15 +130,21 @@ echo "Stopping the server component"
echo "*************************************************************************"
kill $serverpid
# If rigctld is still running, stop it
checkrigctld=`ps auxw | grep -i rigctld | grep -v grep`
if [ ! -z "$checkrigctld" ];
# If rigctld was already running before starting FreeDATA, leave it alone
# otherwise we should clean it up
if [ -z "$checkrigexist" ];
then
echo "*************************************************************************"
echo "Stopping rigctld"
echo "*************************************************************************"
rigpid=`echo $checkrigctld | cut -f2 -d" "`
kill $rigpid
# rigctld was started by FreeDATA and should have stoppped when the
# server exited. If it didn't, stop it now.
checkrigctld=`ps auxw | grep -i rigctld | grep -v grep`
if [ ! -z "$checkrigctld" ];
then
echo "*************************************************************************"
echo "Stopping rigctld"
echo "*************************************************************************"
rigpid=`echo $checkrigctld | cut -f2 -d" "`
kill $rigpid
fi
fi
# Return to the directory we started in