Update

ForteFibre · Mar 28, 2024 · 2963b9e · 2963b9e
1 parent bdd24ee
commit 2963b9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/buildroot/scripts/debian.bash b/buildroot/scripts/debian.bash
@@ -18,10 +18,8 @@ colcon --log-base /dev/null list -t -n | awk '{ pkg = $1; gsub("_", "-", pkg); p
 cat /tmp/rosdep.yaml
 echo "yaml file:///tmp/rosdep.yaml" | sudo tee /etc/ros/rosdep/sources.list.d/50-my-packages.list -a
 
-if [ -d /mimic-cross && -d /etc/apt/auth.conf.d/ ]; then
+if [ -d /mimic-cross ]; then
     cp -r /etc/apt/auth.conf.d/. /mimic-cross/etc/apt/auth.conf.d/ || true
-fi
-if [ -d /mimic-cross && -d /etc/apt/keyrings.d/ ]; then
     cp -r /etc/apt/keyrings.d/. /mimic-cross/etc/apt/keyrings.d/ || true
 fi
 

diff --git a/buildroot/scripts/entrypoint.bash b/buildroot/scripts/entrypoint.bash
@@ -12,7 +12,7 @@ source /opt/ros/${ROS_DISTRO}/setup.bash
 # Create deb or colcon build
 if [ "$1" = 'deb' ]; then
     if [ -n "$INPUT_PRE_SCRIPT" ]; then
-        bash -c "$INPUT_PRE_SCRIPT"
+        bash -c "$INPUT_PRE_SCRIPT" || true
     fi
     bash /scripts/debian.bash
 elif [ "$1" = 'bash' ]; then