finalize

IOES-Lab · Oct 23, 2024 · 98cc9a9 · 98cc9a9
1 parent b77235d
commit 98cc9a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.docker/jazzy.amd64.dockerfile b/.docker/jazzy.amd64.dockerfile
@@ -54,11 +54,11 @@ extras/ros-jazzy-binary-gz-harmonic-source-install.sh install.sh
 RUN bash install.sh
 
 # Install Ardupilot - Ardusub
-ADD https://raw.githubusercontent.com/IOES-Lab/dave/ardusub_install/\
+ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
 extras/ardusub-ubuntu-install.sh install.sh
 RUN bash install.sh
 # Install mavros
-ADD https://raw.githubusercontent.com/IOES-Lab/dave/ardusub_install/\
+ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
 extras/mavros-ubuntu-install.sh install.sh
 RUN bash install.sh
 

diff --git a/.docker/jazzy.arm64v8.dockerfile b/.docker/jazzy.arm64v8.dockerfile
@@ -105,7 +105,7 @@ RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pk
     gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-gl \
     && rm -rf /var/lib/apt/lists/
 # Install mavros
-ADD https://raw.githubusercontent.com/IOES-Lab/dave/ardusub_install/\
+ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
 extras/mavros-ubuntu-install.sh install.sh
 RUN bash install.sh
 
@@ -123,7 +123,7 @@ extras/background.png && \
 
 # Install Ardupilot - Ardusub
 USER docker
-RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/ardusub_install/extras/ardusub-ubuntu-install-local.sh
+RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/ardusub-ubuntu-install-local.sh
 RUN chmod +x /tmp/install.sh && bash /tmp/install.sh
 
 # Set up Dave workspace

diff --git a/extras/mavros-ubuntu-install.sh b/extras/mavros-ubuntu-install.sh
@@ -19,7 +19,7 @@ export MAVROS_RELEASE=ros2
 export MAVLINK_RELEASE=release/rolling/mavlink
 mkdir -p "/opt/mavros/src" && cd "/opt/mavros" || exit
 vcs import --force --shallow --retry 0 \
-        --input https://raw.githubusercontent.com/IOES-Lab/dave/ardusub_install/extras/repos/mavros.jazzy.repos src
+        --input https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/repos/mavros.jazzy.repos src
 
 # Install MAVROS dependencies
 apt update && apt install -y libasio-dev libtinyxml2-dev python3-dev \