Merge pull request #176 from RobotWebTools/rename

rename rosapi script to rosapi_node to address #170
RobotWebTools · Mar 17, 2015 · 378b575 · 378b575
2 parents 252b738 + 1038ff1
commit 378b575
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/rosapi/CMakeLists.txt b/rosapi/CMakeLists.txt
@@ -44,7 +44,7 @@ catkin_package(
   CATKIN_DEPENDS message_runtime
 )
 
-install(PROGRAMS scripts/rosapi
+install(PROGRAMS scripts/rosapi_node
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
diff --git a/rosapi/scripts/rosapi → rosapi/scripts/rosapi_node b/rosapi/scripts/rosapi → rosapi/scripts/rosapi_node
@@ -170,7 +170,7 @@ def dict_to_typedef(typedefdict):
 
 if __name__ == '__main__':
      try:
-         rospy.init_node('rosapi')
+         rospy.init_node('rosapi_node')
          register_services()
          rospy.loginfo("Rosapi started")
          rospy.spin()

diff --git a/rosbridge_server/launch/rosbridge_tcp.launch b/rosbridge_server/launch/rosbridge_tcp.launch
@@ -57,5 +57,5 @@
     </node>
   </group>
 
-  <node name="rosapi" pkg="rosapi" type="rosapi" />
+  <node name="rosapi" pkg="rosapi" type="rosapi_node" />
 </launch>
diff --git a/rosbridge_server/launch/rosbridge_websocket.launch b/rosbridge_server/launch/rosbridge_websocket.launch
@@ -23,5 +23,5 @@
     </node>
   </group>
 
-  <node name="rosapi" pkg="rosapi" type="rosapi" />
+  <node name="rosapi" pkg="rosapi" type="rosapi_node" />
 </launch>