Skip to content

Commit

Permalink
Merge pull request #26 from ika-rwth-aachen/fix/rosdep-with-alternatives
Browse files Browse the repository at this point in the history
Improve rosdep simulate output
  • Loading branch information
jpbusch authored Jun 19, 2024
2 parents c925799 + 6c7ec38 commit 765efcf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ RUN echo "set -e" >> $WORKSPACE/.install-dependencies.sh && \
export OS="ubuntu:$(lsb_release -c | awk '{print $2}')" && \
if [[ "$ROS_DISTRO" = "rolling" && "$OS" = "ubuntu:focal" ]]; then export OS="ubuntu:jammy"; fi && \
set -o pipefail && \
ROS_PACKAGE_PATH=$(pwd):$ROS_PACKAGE_PATH rosdep install --os $OS -y --simulate --from-paths src --ignore-src | tee -a $WORKSPACE/.install-dependencies.sh && \
ROS_PACKAGE_PATH=$(pwd):$ROS_PACKAGE_PATH rosdep install --os $OS -y --simulate --from-paths src --ignore-src \
| sed -E "s/'apt-get install -y ([^']+)' \(alternative 1\/1\)/apt-get install -y \1/" \
| tee -a $WORKSPACE/.install-dependencies.sh && \
chmod +x $WORKSPACE/.install-dependencies.sh && \
rm -rf /var/lib/apt/lists/*
Expand Down

0 comments on commit 765efcf

Please sign in to comment.