From 1038ff149bab6887367df24c4a4b335b17ed9d53 Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Tue, 17 Mar 2015 17:09:03 +0900
Subject: [PATCH] rename rosapi script to rosapi_node to address #170

---
 rosapi/CMakeLists.txt                              | 2 +-
 rosapi/scripts/{rosapi => rosapi_node}             | 2 +-
 rosbridge_server/launch/rosbridge_tcp.launch       | 2 +-
 rosbridge_server/launch/rosbridge_websocket.launch | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename rosapi/scripts/{rosapi => rosapi_node} (99%)

diff --git a/rosapi/CMakeLists.txt b/rosapi/CMakeLists.txt
index 612c5ba20..85ff0937a 100644
--- 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 b/rosapi/scripts/rosapi_node
similarity index 99%
rename from rosapi/scripts/rosapi
rename to rosapi/scripts/rosapi_node
index b3f0b328c..32a6a51ca 100755
--- a/rosapi/scripts/rosapi
+++ b/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
index a5f2cc393..e8b79b2cd 100644
--- 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
index f0de5d4e8..621adb686 100644
--- 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>