From a1570057c8c4359722552b808c1d8f9cb834d216 Mon Sep 17 00:00:00 2001
From: AAlon <avishaya@amazon.com>
Date: Mon, 17 Jun 2019 16:21:31 -0700
Subject: [PATCH 1/3] Always install colcon bundle from source

---
 ros1_sa_build.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ros1_sa_build.sh b/ros1_sa_build.sh
index 31943a0..89150d6 100755
--- a/ros1_sa_build.sh
+++ b/ros1_sa_build.sh
@@ -10,6 +10,13 @@ sh -c 'echo "deb  http://13.52.195.14/ubuntu/main $(lsb_release -sc) main" > /et
 apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
 apt-get update && apt-get install --no-install-recommends -y python-rosdep python-rosinstall python3-colcon-common-extensions ros-$ROS_DISTRO-ros-base
 pip3 install colcon-bundle colcon-ros-bundle
+# Get latest colcon bundle
+COLCON_BUNDLE_INSTALL_PATH="${HOME}/colcon-bundle"
+rm -rf "${COLCON_BUNDLE_INSTALL_PATH}"
+git clone https://github.com/colcon/colcon-bundle "${COLCON_BUNDLE_INSTALL_PATH}"
+pip3 install --upgrade pip
+pip install -U --editable "${COLCON_BUNDLE_INSTALL_PATH}"
+
 # Remove the old rosdep sources.list
 rm -rf /etc/ros/rosdep/sources.list.d/*
 rosdep init && rosdep update

From 1053a66e9541d92388c3179eb6a3467ddbdcd458 Mon Sep 17 00:00:00 2001
From: AAlon <avishaya@amazon.com>
Date: Mon, 17 Jun 2019 16:22:38 -0700
Subject: [PATCH 2/3] Remove redundant installation of colcon bundle from
 post_rosdep_install.sh

---
 gazebo/9/post_rosdep_install.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gazebo/9/post_rosdep_install.sh b/gazebo/9/post_rosdep_install.sh
index 2d67469..ced0637 100644
--- a/gazebo/9/post_rosdep_install.sh
+++ b/gazebo/9/post_rosdep_install.sh
@@ -10,12 +10,6 @@ echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -c
 wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
 apt-get update
 
-COLCON_BUNDLE_INSTALL_PATH="${HOME}/colcon-bundle"
-rm -rf "${COLCON_BUNDLE_INSTALL_PATH}"
-git clone https://github.com/colcon/colcon-bundle "${COLCON_BUNDLE_INSTALL_PATH}"
-pip3 install --upgrade pip
-pip install -U --editable "${COLCON_BUNDLE_INSTALL_PATH}"
-
 G9_APT_FILE="/etc/ros/rosdep/sources.list.d/00-gazebo9.list"
 rm -f "${G9_APT_FILE}"
 touch "${G9_APT_FILE}"

From 9fdfc4787d84fd14f664ef1c7899b64f21dbc29b Mon Sep 17 00:00:00 2001
From: AAlon <avishaya@amazon.com>
Date: Mon, 17 Jun 2019 19:52:56 -0700
Subject: [PATCH 3/3] Use a specific commit of colcon bundle

---
 ros1_sa_build.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ros1_sa_build.sh b/ros1_sa_build.sh
index 89150d6..e346651 100755
--- a/ros1_sa_build.sh
+++ b/ros1_sa_build.sh
@@ -10,10 +10,19 @@ sh -c 'echo "deb  http://13.52.195.14/ubuntu/main $(lsb_release -sc) main" > /et
 apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
 apt-get update && apt-get install --no-install-recommends -y python-rosdep python-rosinstall python3-colcon-common-extensions ros-$ROS_DISTRO-ros-base
 pip3 install colcon-bundle colcon-ros-bundle
+
 # Get latest colcon bundle
 COLCON_BUNDLE_INSTALL_PATH="${HOME}/colcon-bundle"
 rm -rf "${COLCON_BUNDLE_INSTALL_PATH}"
 git clone https://github.com/colcon/colcon-bundle "${COLCON_BUNDLE_INSTALL_PATH}"
+
+# Switch to commit "Support Melodic, fix aptitude trusted key config"
+#  https://github.com/colcon/colcon-bundle/commit/d5ea60e1a9adb34c5ba96e0fbd32fcd188cde15a
+WORKING_DIRECTORY=${PWD}
+cd ${COLCON_BUNDLE_INSTALL_PATH}
+git checkout d5ea60e1a9adb34c5ba96e0fbd32fcd188cde15a
+cd ${WORKING_DIRECTORY}
+
 pip3 install --upgrade pip
 pip install -U --editable "${COLCON_BUNDLE_INSTALL_PATH}"