Merge pull request ros-simulation#390 from peci1/issue_387_remove_ros…

…_remappings [gazebo_ros] Remove ROS remapping arguments from gazebo_ros launch scripts.
lucasw · Mar 10, 2016 · c190bf6 · c190bf6
2 parents 554a0e4 + 5a9e5f1
commit c190bf6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/gazebo_ros/scripts/debug b/gazebo_ros/scripts/debug
@@ -1,6 +1,10 @@
 #!/bin/sh
 final="$@"
 
+# remove ros remapping arguments like "__name:=node_name"; otherwise, they'd 
+# be interpreted as a world name by gzserver, and it'd crash while loading it
+final=`echo "$final" | sed 's/[^ ]*:=[^ ]* \?//g'`
+
 EXT=so
 if [ $(uname) == "Darwin" ]; then
     EXT=dylib

diff --git a/gazebo_ros/scripts/gazebo b/gazebo_ros/scripts/gazebo
@@ -1,6 +1,10 @@
 #!/bin/sh
 final="$@"
 
+# remove ros remapping arguments like "__name:=node_name"; otherwise, they'd 
+# be interpreted as a world name by gzserver, and it'd crash while loading it
+final=`echo "$final" | sed 's/[^ ]*:=[^ ]* \?//g'`
+
 EXT=so
 SIGNAL=SIGINT
 if [ $(uname) = "Darwin" ]; then

diff --git a/gazebo_ros/scripts/gzclient b/gazebo_ros/scripts/gzclient
@@ -1,6 +1,10 @@
 #!/bin/sh
 final="$@"
 
+# remove ros remapping arguments like "__name:=node_name"; otherwise, they'd 
+# be interpreted as a world name by gzserver, and it'd crash while loading it
+final=`echo "$final" | sed 's/[^ ]*:=[^ ]* \?//g'`
+
 EXT=so
 if [ $(uname) = "Darwin" ]; then
     EXT=dylib

diff --git a/gazebo_ros/scripts/gzserver b/gazebo_ros/scripts/gzserver
@@ -1,6 +1,10 @@
 #!/bin/sh
 final="$@"
 
+# remove ros remapping arguments like "__name:=node_name"; otherwise, they'd 
+# be interpreted as a world name by gzserver, and it'd crash while loading it
+final=`echo "$final" | sed 's/[^ ]*:=[^ ]* \?//g'`
+
 EXT=so
 if [ $(uname) = "Darwin" ]; then
     EXT=dylib

diff --git a/gazebo_ros/scripts/perf b/gazebo_ros/scripts/perf
@@ -1,6 +1,10 @@
 #!/bin/sh
 final="$@"
 
+# remove ros remapping arguments like "__name:=node_name"; otherwise, they'd 
+# be interpreted as a world name by gzserver, and it'd crash while loading it
+final=`echo "$final" | sed 's/[^ ]*:=[^ ]* \?//g'`
+
 EXT=so
 if [ $(uname) = "Darwin" ]; then
     EXT=dylib