From 0c3f51944500b713eebba524e2a072b77fb47a65 Mon Sep 17 00:00:00 2001
From: tumbili <bapstr@ethz.ch>
Date: Mon, 26 Oct 2015 12:18:24 +0100
Subject: [PATCH 1/2] renamed SITL startup scripts

---
 posix-configs/SITL/init/{rcS_iris_gazebo => rcS_gazebo} | 0
 posix-configs/SITL/init/{rcS => rcS_jmavsim}            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename posix-configs/SITL/init/{rcS_iris_gazebo => rcS_gazebo} (100%)
 rename posix-configs/SITL/init/{rcS => rcS_jmavsim} (100%)

diff --git a/posix-configs/SITL/init/rcS_iris_gazebo b/posix-configs/SITL/init/rcS_gazebo
similarity index 100%
rename from posix-configs/SITL/init/rcS_iris_gazebo
rename to posix-configs/SITL/init/rcS_gazebo
diff --git a/posix-configs/SITL/init/rcS b/posix-configs/SITL/init/rcS_jmavsim
similarity index 100%
rename from posix-configs/SITL/init/rcS
rename to posix-configs/SITL/init/rcS_jmavsim

From 1767acd1e9966d198916a84a1421f630b229d241 Mon Sep 17 00:00:00 2001
From: tumbili <bapstr@ethz.ch>
Date: Mon, 26 Oct 2015 12:23:22 +0100
Subject: [PATCH 2/2] use correct startup scipt depending on simulator

---
 Tools/sitl_run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index f13ed94509..fff0080ca9 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -68,12 +68,12 @@ touch rootfs/eeprom/parameters
 # Start Java simulator
 if [ "$debugger" == "lldb" ]
 then
-	lldb -- mainapp ../../../../$rc_script
+	lldb -- mainapp ../../../../${rc_script}_${program}
 elif [ "$debugger" == "gdb" ]
 then
-	gdb --args mainapp ../../../../$rc_script
+	gdb --args mainapp ../../../../${rc_script}_${program}
 else
-	./mainapp ../../../../$rc_script
+	./mainapp ../../../../${rc_script}_${program}
 fi
 
 if [ "$3" == "jmavsim" ]