From 0f11ab084b9dbfabfeaa099122c7ef788f07695a Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Tue, 30 Jun 2020 15:27:54 +0200
Subject: [PATCH] Move modification of README to add ROS added interface.
 Placed before changing the code. Then if README is corrupted the script exits
 and nothing is modified

---
 add_action_server_client.sh       | 7 ++++---
 add_service_server_client.sh      | 7 ++++---
 add_tf_listener_broadcaster.sh    | 7 ++++---
 add_topic_publisher_subscriber.sh | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/add_action_server_client.sh b/add_action_server_client.sh
index ac6639e..08484af 100755
--- a/add_action_server_client.sh
+++ b/add_action_server_client.sh
@@ -114,6 +114,10 @@ fi
 #go to package folder
 roscd "${ros_pkg}"
 
+#modify readme with added ROS interface
+type="action"
+fill_readme_ros_interface ${type} ${server_client} ${ros_pkg} ${action_name} ${file_pkg} ${action_file}.action "false"
+
 #modify node files adding server/client parameters
 if [[ "${server_client}" = "server" ]]
 then
@@ -121,6 +125,3 @@ then
 else
   create_action_client ${ros_pkg} ${action_name} ${action_file%.action} ${file_pkg} ${node_h} ${node_c} ${driver_alg}
 fi
-
-type="action"
-fill_readme_ros_interface ${type} ${server_client} ${ros_pkg} ${action_name} ${file_pkg} ${action_file}.action "false"
\ No newline at end of file
diff --git a/add_service_server_client.sh b/add_service_server_client.sh
index 8d19a9f..5bd87f1 100755
--- a/add_service_server_client.sh
+++ b/add_service_server_client.sh
@@ -113,6 +113,10 @@ fi
 #go to package folder
 roscd "${ros_pkg}"
 
+#modify readme with added ROS interface
+type="service"
+fill_readme_ros_interface ${type} ${server_client} ${ros_pkg} ${service_name} ${file_pkg} ${srv_file} "false"
+
 #modify node files adding server/client parameters
 if [[ "${server_client}" = "server" ]]
 then
@@ -120,6 +124,3 @@ then
 else
   create_client ${ros_pkg} ${service_name} ${srv_file%.srv} ${file_pkg} ${node_h} ${node_c} ${driver_alg}
 fi
-
-type="service"
-fill_readme_ros_interface ${type} ${server_client} ${ros_pkg} ${service_name} ${file_pkg} ${srv_file} "false"
\ No newline at end of file
diff --git a/add_tf_listener_broadcaster.sh b/add_tf_listener_broadcaster.sh
index dbf4b91..4bc1521 100755
--- a/add_tf_listener_broadcaster.sh
+++ b/add_tf_listener_broadcaster.sh
@@ -90,6 +90,10 @@ fi
 #go to package folder
 roscd "${ros_pkg}"
 
+#modify readme with added ROS interface
+type="topic"
+fill_readme_ros_interface ${type} ${pub_subs} ${ros_pkg} "tf" "tf" "tfMessage" "true"
+
 #modify node files adding server/client parameters
 if [[ "${pub_subs}" = "broadcaster" ]]
 then
@@ -97,6 +101,3 @@ then
 else
   create_tf_listener     ${ros_pkg} ${node_h} ${node_c} ${driver_alg}
 fi
-
-type="topic"
-fill_readme_ros_interface ${type} ${pub_subs} ${ros_pkg} "tf" "tf" "tfMessage" "true"
\ No newline at end of file
diff --git a/add_topic_publisher_subscriber.sh b/add_topic_publisher_subscriber.sh
index 5504b8b..083670a 100755
--- a/add_topic_publisher_subscriber.sh
+++ b/add_topic_publisher_subscriber.sh
@@ -136,6 +136,10 @@ fi
 #go to package folder
 roscd "${ros_pkg}"
 
+#modify readme with added ROS interface
+type="topic"
+fill_readme_ros_interface ${type} ${pub_subs} ${ros_pkg} ${topic_name} ${file_pkg} ${msg_file} "false"
+
 #modify node files adding server/client parameters
 if [[ "${pub_subs}" = "publisher" ]]
 then
@@ -143,6 +147,3 @@ then
 else
   create_subscriber ${ros_pkg} ${topic_name} ${msg_file%.msg} ${file_pkg} ${buffer} ${node_h} ${node_c} ${driver_alg}
 fi
-
-type="topic"
-fill_readme_ros_interface ${type} ${pub_subs} ${ros_pkg} ${topic_name} ${file_pkg} ${msg_file} "false"
\ No newline at end of file
-- 
GitLab