Fixed issue with not sourcing bashrc in tasks

Robotic-Decision-Making-Lab · Jan 11, 2024 · 32e4eaa · 32e4eaa
1 parent e9e2584
commit 32e4eaa
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,6 +9,13 @@
     "*.sdf": "xml"
   },
   "terminal.integrated.defaultProfile.linux": "bash",
+  "terminal.integrated.profiles.linux": {
+    "bash": {
+      "path": "bash",
+      "icon": "terminal-bash",
+      "args": ["-i"]
+    }
+  },
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,
   "editor.formatOnSave": true,

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,7 +5,7 @@
       "label": "ROS 2: Build",
       "detail": "Build the workspace using colcon",
       "type": "shell",
-      "command": "colcon build --symlink-install && source install/setup.bash",
+      "command": "colcon build --symlink-install",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -22,22 +22,45 @@
         "isDefault": true
       }
     },
+    {
+      "label": "ROS 2: Source workspace",
+      "detail": "Source the ROS 2 workspace",
+      "type": "shell",
+      "command": "source install/setup.bash",
+      "problemMatcher": []
+    },
     {
       "label": "ROS 2: Create ament_cmake package",
       "detail": "Create a new ROS 2 ament_cmake package",
       "type": "shell",
-      "command": "ros2 pkg create --destination-directory src --build-type ament_cmake ${input:packageName}",
+      "command": "ros2 pkg create --build-type ament_cmake --license ${input:license} ${input:packageName}",
       "problemMatcher": []
     },
     {
       "label": "ROS 2: Create ament_python package",
       "detail": "Create a new ROS 2 ament_python package",
       "type": "shell",
-      "command": "ros2 pkg create --destination-directory src --build-type ament_python ${input:packageName}",
+      "command": "ros2 pkg create --build-type ament_python --license ${input:license} ${input:packageName}",
       "problemMatcher": []
     }
   ],
   "inputs": [
+    {
+      "id": "license",
+      "type": "pickString",
+      "description": "License",
+      "options": [
+        "Apache-2.0",
+        "BSL-1.0",
+        "BSD-2.0",
+        "BSD-2-Clause",
+        "BSD-3-Clause",
+        "GPL-3.0-only",
+        "LGPL-3.0-only",
+        "MIT",
+        "MIT-0"
+      ]
+    },
     {
       "id": "packageName",
       "type": "promptString",