Skip to content

Commit 4e0e1a4

Browse files
committed
Fix sourcing setup.bash not working
1 parent 5cc1233 commit 4e0e1a4

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

scripts/activate_workspace.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,10 @@ activate_ubuntu() {
195195

196196
log_info "[4/4] Sourcing workspace overlay..."
197197
if [ -f "$COFFEE_WS_PATH/install/setup.bash" ]; then
198-
pushd "$COFFEE_WS_PATH" > /dev/null
199-
source install/setup.bash
200-
popd > /dev/null
198+
cd "$COFFEE_WS_PATH"
199+
cd install
200+
source setup.bash
201+
cd ..
201202
else
202203
log_warning "Workspace not built yet. Run 'colcon build' in $COFFEE_WS_PATH"
203204
fi
@@ -229,9 +230,10 @@ activate_macos() {
229230

230231
log_info "[3/3] Sourcing workspace overlay..."
231232
if [ -f "$COFFEE_WS_PATH/install/setup.bash" ]; then
232-
pushd "$COFFEE_WS_PATH" > /dev/null
233-
source install/setup.bash
234-
popd > /dev/null
233+
cd "$COFFEE_WS_PATH"
234+
cd install
235+
source setup.bash
236+
cd ..
235237

236238
# Set macOS-specific environment variables for Qt applications
237239
# Set macOS Qt environment variables for GUI applications

0 commit comments

Comments
 (0)