simulator: Do not kill every process with string 'px4' in the name

This commit is contained in:
Janis Dzerve
2017-01-18 11:16:34 +02:00
committed by Lorenz Meier
parent 6bcf9266dc
commit 3c270ae2a8
2 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -20,7 +20,8 @@ rc_script="posix-configs/SITL/init/ekf2/multiple_iris"
build_path=${src_path}/build_posix_sitl_default
echo "killing running instances"
pkill px4
pkill -x px4 || true
sleep 1
cd $build_path
+4 -2
View File
@@ -57,8 +57,10 @@ fi
# kill process names that might stil
# be running from last time
pgrep gazebo && pkill gazebo
pgrep px4 && pkill px4
pkill -x gazebo || true
pkill -x px4 || true
pkill -x px4_$model || true
jmavsim_pid=`ps aux | grep java | grep Simulator | cut -d" " -f1`
if [ -n "$jmavsim_pid" ]
then