From bdc80b2ce2670fb97b1ae3af0ddf589040cbd83a Mon Sep 17 00:00:00 2001
From: Justin Beri <18635834+justinberi@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:12:51 +1000
Subject: [PATCH 1/2] Update setup.sh

---
 setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.sh b/setup.sh
index 644f10d54..92d28af21 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,6 +4,8 @@ echo "#########################"
 echo "Install base dependencies"
 echo "#########################"
 echo
+
+sudo apt update
 sudo apt install -y doxygen libeigen3-dev python3-catkin-tools python-pip
 pip install cpplint
 

From ceca5e51e334c594824a6dd777eb7f9d522b3cef Mon Sep 17 00:00:00 2001
From: Justin Beri <justin [dot] beri [at] csiro [dot] au>
Date: Mon, 13 Jun 2022 21:20:40 +1000
Subject: [PATCH 2/2] Minor setup refactor for speed and error reporting

---
 global_body_planner/setup_deps.sh |  8 ++++----
 quad_simulator/setup_deps.sh      | 18 +++++++++---------
 quad_utils/setup_deps.sh          |  9 +++++----
 setup.sh                          |  5 ++++-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/global_body_planner/setup_deps.sh b/global_body_planner/setup_deps.sh
index 31d9db6dd..7b26dd10b 100755
--- a/global_body_planner/setup_deps.sh
+++ b/global_body_planner/setup_deps.sh
@@ -1,4 +1,4 @@
-sudo apt install -y ros-melodic-tf
-sudo apt install -y ros-melodic-tf2
-sudo apt install -y ros-melodic-tf2-geometry-msgs
-sudo apt install -y ros-melodic-grid-map
\ No newline at end of file
+sudo apt install -y ros-melodic-tf \
+    ros-melodic-tf2 \
+    ros-melodic-tf2-geometry-msgs \
+    ros-melodic-grid-map
\ No newline at end of file
diff --git a/quad_simulator/setup_deps.sh b/quad_simulator/setup_deps.sh
index a725b05ba..04bc2d33c 100755
--- a/quad_simulator/setup_deps.sh
+++ b/quad_simulator/setup_deps.sh
@@ -16,12 +16,12 @@ sudo apt install -y gazebo9 -y
 
 
 
-sudo apt install -y ros-melodic-controller-manager -y
-sudo apt install -y ros-melodic-joint-state-controller -y
-sudo apt install -y ros-melodic-gazebo-ros-pkgs -y
-sudo apt install -y ros-melodic-ros-control -y
-sudo apt install -y ros-melodic-gazebo-ros-control -y
-sudo apt install -y ros-melodic-effort-controllers -y
-sudo apt install -y ros-melodic-robot-state-publisher -y
-sudo apt install -y ros-melodic-imu-tools -y
-sudo apt install -y ros-melodic-message-to-tf -y
\ No newline at end of file
+sudo apt install -y ros-melodic-controller-manager
+    ros-melodic-joint-state-controller \
+    ros-melodic-gazebo-ros-pkgs \
+    ros-melodic-ros-control \
+    ros-melodic-gazebo-ros-control \
+    ros-melodic-effort-controllers \
+    ros-melodic-robot-state-publisher \
+    ros-melodic-imu-tools \
+    ros-melodic-message-to-tf
\ No newline at end of file
diff --git a/quad_utils/setup_deps.sh b/quad_utils/setup_deps.sh
index dcbfa8f87..61f946ddb 100755
--- a/quad_utils/setup_deps.sh
+++ b/quad_utils/setup_deps.sh
@@ -1,4 +1,5 @@
-sudo apt install -y libeigen3-dev
-sudo apt install -y python-pygame
-sudo apt install -y ros-melodic-plotjuggler-ros
-sudo apt install -y tmux
\ No newline at end of file
+sudo apt install -y \
+    libeigen3-dev \
+    python-pygame \
+    ros-melodic-plotjuggler-ros \
+    tmux
diff --git a/setup.sh b/setup.sh
index 92d28af21..ccae2eb23 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,3 +1,6 @@
+# Complain loudly if something goes wrong
+set -eu
+
 # Install all common dependencies
 echo
 echo "#########################"
@@ -31,4 +34,4 @@ echo "#######################"
 echo "Install all rosdeps"
 echo "#######################"
 echo
-rosdep install --from-paths .. --ignore-src -r -y --rosdistro melodic
+rosdep update && rosdep install --from-paths .. --ignore-src -r -y --rosdistro melodic