Skip to content

Commit 32e4eaa

Browse files
committed
Fixed issue with not sourcing bashrc in tasks
1 parent e9e2584 commit 32e4eaa

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
"*.sdf": "xml"
1010
},
1111
"terminal.integrated.defaultProfile.linux": "bash",
12+
"terminal.integrated.profiles.linux": {
13+
"bash": {
14+
"path": "bash",
15+
"icon": "terminal-bash",
16+
"args": ["-i"]
17+
}
18+
},
1219
"files.insertFinalNewline": true,
1320
"files.trimTrailingWhitespace": true,
1421
"editor.formatOnSave": true,

.vscode/tasks.json

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"label": "ROS 2: Build",
66
"detail": "Build the workspace using colcon",
77
"type": "shell",
8-
"command": "colcon build --symlink-install && source install/setup.bash",
8+
"command": "colcon build --symlink-install",
99
"group": {
1010
"kind": "build",
1111
"isDefault": true
@@ -22,22 +22,45 @@
2222
"isDefault": true
2323
}
2424
},
25+
{
26+
"label": "ROS 2: Source workspace",
27+
"detail": "Source the ROS 2 workspace",
28+
"type": "shell",
29+
"command": "source install/setup.bash",
30+
"problemMatcher": []
31+
},
2532
{
2633
"label": "ROS 2: Create ament_cmake package",
2734
"detail": "Create a new ROS 2 ament_cmake package",
2835
"type": "shell",
29-
"command": "ros2 pkg create --destination-directory src --build-type ament_cmake ${input:packageName}",
36+
"command": "ros2 pkg create --build-type ament_cmake --license ${input:license} ${input:packageName}",
3037
"problemMatcher": []
3138
},
3239
{
3340
"label": "ROS 2: Create ament_python package",
3441
"detail": "Create a new ROS 2 ament_python package",
3542
"type": "shell",
36-
"command": "ros2 pkg create --destination-directory src --build-type ament_python ${input:packageName}",
43+
"command": "ros2 pkg create --build-type ament_python --license ${input:license} ${input:packageName}",
3744
"problemMatcher": []
3845
}
3946
],
4047
"inputs": [
48+
{
49+
"id": "license",
50+
"type": "pickString",
51+
"description": "License",
52+
"options": [
53+
"Apache-2.0",
54+
"BSL-1.0",
55+
"BSD-2.0",
56+
"BSD-2-Clause",
57+
"BSD-3-Clause",
58+
"GPL-3.0-only",
59+
"LGPL-3.0-only",
60+
"MIT",
61+
"MIT-0"
62+
]
63+
},
4164
{
4265
"id": "packageName",
4366
"type": "promptString",

0 commit comments

Comments
 (0)