From 6cb6ce8f563b4adf32c88018573f74d21adf5872 Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Sun, 28 Jan 2024 22:13:49 -0800 Subject: [PATCH] Fixed environment paths for catkin --- .docker/Dockerfile | 2 +- .vscode/settings.json | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 9322aee..de3296c 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -77,7 +77,7 @@ RUN sudo apt-get -q update \ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \ && catkin_make \ && sudo sed -i "s#/opt/ros/\$ROS_DISTRO/setup.bash#$USER_WORKSPACE/setup.sh#g" /ros_entrypoint.sh \ - && echo "source ${USER_WORKSPACE}/install/setup.bash" >> /home/$USERNAME/.bashrc \ + && echo "source ${USER_WORKSPACE}/devel/setup.bash" >> /home/$USERNAME/.bashrc \ && echo "if [ -f /opt/ros/${ROS_DISTRO}/setup.bash ]; then source /opt/ros/${ROS_DISTRO}/setup.bash; fi" >> /home/$USERNAME/.bashrc FROM robot as desktop diff --git a/.vscode/settings.json b/.vscode/settings.json index ed91ede..6113c11 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,14 +23,12 @@ "autoDocstring.startOnNewLine": false, "autoDocstring.docstringFormat": "google-notypes", "python.autoComplete.extraPaths": [ - "/opt/ros/noetic/lib/python3.8/site-packages/", - "/opt/ros/noetic/local/lib/python3.8/dist-packages/", - "${workspaceFolder}/install/" + "/opt/ros/noetic/local/lib/python3/dist-packages/", + "${workspaceFolder}/src/" ], "python.analysis.extraPaths": [ - "/opt/ros/noetic/lib/python3.8/site-packages/", - "/opt/ros/noetic/local/lib/python3.8/dist-packages/", - "${workspaceFolder}/install/" + "/opt/ros/noetic/local/lib/python3/dist-packages/", + "${workspaceFolder}/src/" ], "C_Cpp.default.intelliSenseMode": "linux-gcc-x86", "C_Cpp.clang_format_fallbackStyle": "Google",