Fixed environment paths for catkin

Robotic-Decision-Making-Lab · Jan 29, 2024 · 6cb6ce8 · 6cb6ce8
1 parent 2cfa793
commit 6cb6ce8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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",