From 900de54cd2ed535a46d4fd54179462001cf90e29 Mon Sep 17 00:00:00 2001
From: Benjamin Gilby <gilbybenjamin@gmail.com>
Date: Mon, 20 Nov 2023 16:24:49 +0900
Subject: [PATCH] clean up comments and unused variables

---
 ansible/roles/ros2/defaults/main.yaml |  1 -
 ansible/roles/ros2/tasks/main.yaml    |  7 +------
 ansible/setup.yaml                    | 10 ----------
 setup-dev-env.sh                      |  6 ------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/ansible/roles/ros2/defaults/main.yaml b/ansible/roles/ros2/defaults/main.yaml
index 8a1823a..91289a0 100644
--- a/ansible/roles/ros2/defaults/main.yaml
+++ b/ansible/roles/ros2/defaults/main.yaml
@@ -1,3 +1,2 @@
 ros_root_dir: /opt/ros/humble
 ros_pkg: ros_base
-skip_keys: "libopencv-dev python3-catkin-pkg-modules"
diff --git a/ansible/roles/ros2/tasks/main.yaml b/ansible/roles/ros2/tasks/main.yaml
index 6416b83..0ac3575 100644
--- a/ansible/roles/ros2/tasks/main.yaml
+++ b/ansible/roles/ros2/tasks/main.yaml
@@ -161,12 +161,12 @@
     - name: Install apt packages
       ansible.builtin.apt:
         name:
+          - apt-utils
           - build-essential
           - cmake
           - git
           - libbullet-dev
           - libpython3-dev
-          #          - python3-colcon-common-extensions
           - python3-flake8
           - python3-pip
           - python3-numpy
@@ -182,7 +182,6 @@
           - libgeographic-dev
           - libgtest-dev
           - libcgal-dev
-          - apt-utils
         install_recommends: false
         update_cache: true
       become: true
@@ -220,10 +219,6 @@
         state: directory
         recurse: true
       become: true
-    #    - name: Create .rosinstall file to hold ROS packages
-    #      ansible.builtin.file:
-    #        path: ros2.{{ ros_distro }}.{{ ros_pkg }}.rosinstall
-    #        state: touch
     - name: Download ROS packages
       ansible.builtin.shell:
         cmd: "rosinstall_generator --deps --rosdistro {{ ros_distro }} {{ ros_pkg }} launch_xml launch_yaml launch_testing launch_testing_ament_cmake demo_nodes_cpp demo_nodes_py example_interfaces camera_calibration_parsers camera_info_manager cv_bridge v4l2_camera vision_opencv vision_msgs image_geometry image_pipeline image_transport compressed_image_transport compressed_depth_image_transport pcl_msgs perception_pcl logging_demo udp_msgs angles diagnostics tf_transformations mrt_cmake_modules gtest_vendor grid_map filters nav2_msgs tf2-eigen ament_cmake_clang_format > {{ ros_root_dir }}/ros2.{{ ros_distro }}.{{ ros_pkg }}.rosinstall"
diff --git a/ansible/setup.yaml b/ansible/setup.yaml
index 95c8151..4048be6 100644
--- a/ansible/setup.yaml
+++ b/ansible/setup.yaml
@@ -14,10 +14,6 @@
     - ptp4l_client_interface: eqos0
     - ptp4l_host_interface: eth0
   vars_prompt:
-#    - name: prompt_install_camera_driver
-#      prompt: |-
-#        [Warning] Do you want to install/update the TIER IV camera driver? [y/N]
-#      private: false
     - name: prompt_configure_network
       prompt: |-
         [Warning] Do you want to configure the network? This configuration may overwrite the IP address of the specific network interface [y/N]
@@ -26,14 +22,8 @@
     - role: autoware
     - role: cuda
     - role: cyclonedds
-#    - role: docker
     - role: vcstool
-#    - role: calibration_tools
-#    - role: tier4_hdr_camera_driver
-#      when: prompt_install_camera_driver == 'y'
     - role: ros2
-#    - role: ptp4l_client
-#      when: prompt_configure_network == 'y'
     - role: ptp4l_host
       when: prompt_configure_network == 'y'
     - role: enlarge_txqueue
diff --git a/setup-dev-env.sh b/setup-dev-env.sh
index e2ac2a5..b17569c 100755
--- a/setup-dev-env.sh
+++ b/setup-dev-env.sh
@@ -10,12 +10,6 @@ if ! (command -v sudo >/dev/null 2>&1); then
     apt-get -y install sudo
 fi
 
-# Disable inactive apt repository
-# DISABLE_TARGET="/etc/apt/sources.list.d/roscube.list"
-# if [ -e ${DISABLE_TARGET} ]; then
-#     sudo sed -i 's/.*neuron\.adlinktech\.com.*/# &/g' ${DISABLE_TARGET}
-# fi
-
 # Install git
 if ! (command -v git >/dev/null 2>&1); then
     sudo apt-get -y update