From d31d806593fec38aa715a63512235e57eec27a18 Mon Sep 17 00:00:00 2001
From: Ryota Higashi <p111035r@mail.kyutech.jp>
Date: Tue, 21 Apr 2020 02:22:02 +0000
Subject: [PATCH 1/2] modify miss of README

---
 README.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index acf599d8..20934cde 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,20 @@ Gazebo (meta) package for RoIS
 
 ## 導入方法
 
-$ ROS 環境の構築
-$ `mkdir gazebo_RoIS_ws`  
-$ `cd gazebo_RoIS_ws`  
-$ `git clone https://inohira.mns.kyutech.ac.jp/git/tanacchi/gazebo_RoIS_tanacchi.git src`  
-$ `cd src`  
-$ `catkin_init_workspace`  
-$ `cd -`  
-$ `catkin_make`  
-$ `echo "source ${PWD}/devel/setup.bash" >> ~/.bashrc` # 必要ならば 
+ROS 環境の構築後以下を実行
+```shell
+$ mkdir gazebo_RoIS_ws
+$ cd gazebo_RoIS_ws 
+$ git clone https://inohira.mns.kyutech.ac.jp/git/tanacchi/gazebo_RoIS_tanacchi.git src
+$ cd src
+$ catkin_init_workspace
+$ sh install_packages.sh  # masterブランチのinstall_packagesは不足がある。以下を追加でインストール(dockerブランチ参照)
+$ sudo apt install ros-melodic-xacro ros-melodic-rviz ros-melodic-robot-state-publisher rosbash
+$ cd ..
+$ catkin_make
+$ echo "source ${PWD}/devel/setup.bash" >> ~/.bashrc` # 必要ならば 
 
+```
 
 ## ディレクトリ構成
 
@@ -34,7 +38,7 @@ gazebo_RoIS_tanacchi    // 当該パッケージ
 
 1. teleop_twist_keyboard を起動．
    操作方法は標準出力もしくはROS公式ドキュメントを参照のこと．  
-   $ `roslaunch rois_gazebo teleop_keybaord.launch`
+   $ `roslaunch rois_gazebo teleop_keyboard.launch`
 2. 別のターミナルで，Gazebo を起動  
    $ `roslaunch rois_gazebo setup_gazebo.launch`
 
-- 
GitLab


From e82b6521a92e97c7ce775592072d9b7fcca03670 Mon Sep 17 00:00:00 2001
From: higashi <p111035r@mail.kyutech.jp>
Date: Tue, 21 Apr 2020 13:57:45 +0900
Subject: [PATCH 2/2] delete install packages

---
 README.md           | 3 +--
 install_packages.sh | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 20934cde..dbec7297 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@ $ cd gazebo_RoIS_ws
 $ git clone https://inohira.mns.kyutech.ac.jp/git/tanacchi/gazebo_RoIS_tanacchi.git src
 $ cd src
 $ catkin_init_workspace
-$ sh install_packages.sh  # masterブランチのinstall_packagesは不足がある。以下を追加でインストール(dockerブランチ参照)
-$ sudo apt install ros-melodic-xacro ros-melodic-rviz ros-melodic-robot-state-publisher rosbash
+$ sh install_packages.sh
 $ cd ..
 $ catkin_make
 $ echo "source ${PWD}/devel/setup.bash" >> ~/.bashrc` # 必要ならば 
diff --git a/install_packages.sh b/install_packages.sh
index 89e855a3..06954965 100755
--- a/install_packages.sh
+++ b/install_packages.sh
@@ -13,7 +13,11 @@ sudo apt install \
   ros-melodic-map-server \
   ros-melodic-move-base \
   ros-melodic-move-base-msgs \
-  ros-melodic-teleop-twist-keyboard
+  ros-melodic-teleop-twist-keyboard \
+  ros-melodic-xacro \
+  ros-melodic-rviz \
+  ros-melodic-robot-state-publisher \
+  rosbash
 
 sudo apt install python-pip python3-pip
 pip  install -r ./route_guidance_ros/requirements.txt
-- 
GitLab