Skip to content

Commit 1762256

Browse files
committed
chore: wip
1 parent f3aedcd commit 1762256

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

packages/launchpad/src/dev/shellcode.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ __launchpad_switch_environment() {
253253
if [[ -n "$__LAUNCHPAD_LAST_ACTIVATION_KEY" ]]; then
254254
# Remove project-specific paths from PATH if they exist
255255
if [[ -n "$LAUNCHPAD_ENV_BIN_PATH" ]]; then
256-
export PATH=$(echo "$PATH" | sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
257-
256+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | /usr/bin/sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | /usr/bin/sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
257+
258258
# Also remove bun global bin directory (derive from env path)
259259
local old_env_dir=$(dirname "$LAUNCHPAD_ENV_BIN_PATH")
260260
if [[ -n "$old_env_dir" ]]; then
261-
export PATH=$(echo "$PATH" | sed "s|$old_env_dir/.bun/bin:||g" | sed "s|:$old_env_dir/.bun/bin||g" | sed "s|^$old_env_dir/.bun/bin$||g")
261+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$old_env_dir/.bun/bin:||g" | /usr/bin/sed "s|:$old_env_dir/.bun/bin||g" | /usr/bin/sed "s|^$old_env_dir/.bun/bin$||g")
262262
fi
263263
fi
264264
@@ -271,7 +271,7 @@ __launchpad_switch_environment() {
271271
unset LAUNCHPAD_ENV_BIN_PATH
272272
unset __LAUNCHPAD_LAST_ACTIVATION_KEY
273273
fi
274-
274+
275275
# Ensure global paths are still available when not in a project
276276
# Add ~/.local/bin to PATH if not already there
277277
if [[ -d "$local_bin" && ":$PATH:" != *":$local_bin:"* ]]; then
@@ -282,7 +282,7 @@ __launchpad_switch_environment() {
282282
if [[ -d "$global_bin" && ":$PATH:" != *":$global_bin:"* ]]; then
283283
export PATH="$PATH:$global_bin"
284284
fi
285-
285+
286286
return 0
287287
fi
288288
@@ -318,12 +318,12 @@ __launchpad_switch_environment() {
318318
if [[ -n "$LAUNCHPAD_CURRENT_PROJECT" && "$LAUNCHPAD_CURRENT_PROJECT" != "$project_dir" ]]; then
319319
# Remove old project paths from PATH
320320
if [[ -n "$LAUNCHPAD_ENV_BIN_PATH" ]]; then
321-
export PATH=$(echo "$PATH" | sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
322-
321+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | /usr/bin/sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | /usr/bin/sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
322+
323323
# Also remove old bun global bin directory (derive from old env path)
324324
local old_env_dir=$(dirname "$LAUNCHPAD_ENV_BIN_PATH")
325325
if [[ -n "$old_env_dir" ]]; then
326-
export PATH=$(echo "$PATH" | sed "s|$old_env_dir/.bun/bin:||g" | sed "s|:$old_env_dir/.bun/bin||g" | sed "s|^$old_env_dir/.bun/bin$||g")
326+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$old_env_dir/.bun/bin:||g" | /usr/bin/sed "s|:$old_env_dir/.bun/bin||g" | /usr/bin/sed "s|^$old_env_dir/.bun/bin$||g")
327327
fi
328328
329329
# Show deactivation message for old project if enabled
@@ -345,21 +345,21 @@ __launchpad_switch_environment() {
345345
if [[ -d "$env_dir/bin" ]]; then
346346
export LAUNCHPAD_CURRENT_PROJECT="$project_dir"
347347
export LAUNCHPAD_ENV_BIN_PATH="$env_dir/bin"
348-
348+
349349
# Remove project-specific path if it was already in PATH
350-
export PATH=$(echo "$PATH" | sed "s|$env_dir/bin:||g" | sed "s|:$env_dir/bin||g" | sed "s|^$env_dir/bin$||g")
351-
350+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$env_dir/bin:||g" | /usr/bin/sed "s|:$env_dir/bin||g" | /usr/bin/sed "s|^$env_dir/bin$||g")
351+
352352
# Add project-specific path first (highest priority)
353353
export PATH="$env_dir/bin:$PATH"
354-
354+
355355
# Add bun global bin directory for this environment (high priority for global installs)
356356
if [[ -d "$env_dir/.bun/bin" ]]; then
357357
# Remove bun global bin path if it was already in PATH
358-
export PATH=$(echo "$PATH" | sed "s|$env_dir/.bun/bin:||g" | sed "s|:$env_dir/.bun/bin||g" | sed "s|^$env_dir/.bun/bin$||g")
358+
export PATH=$(echo "$PATH" | /usr/bin/sed "s|$env_dir/.bun/bin:||g" | /usr/bin/sed "s|:$env_dir/.bun/bin||g" | /usr/bin/sed "s|^$env_dir/.bun/bin$||g")
359359
# Add it with high priority (after project bin but before system paths)
360360
export PATH="$PATH:$env_dir/.bun/bin"
361361
fi
362-
362+
363363
# Now ensure global paths are available but with lower priority
364364
# Add ~/.local/bin to PATH if not already there (after project paths)
365365
if [[ -d "$local_bin" && ":$PATH:" != *":$local_bin:"* ]]; then

packages/launchpad/test/services.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ describe('Service Management', () => {
365365
})
366366

367367
it('should handle enabling non-existent service', async () => {
368-
// The service manager catches errors and returns an error object instead of throwing
368+
// The service manager catches errors and returns false instead of throwing
369369
const result = await enableService('unknown-service')
370-
expect(result).toMatchObject({ success: false, error: 'Service stop failed' })
370+
expect(result).toBe(false)
371371
})
372372

373373
it('should handle disabling non-registered service', async () => {

packages/launchpad/test/shell-integration-path-precedence.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('Shell Integration PATH Precedence', () => {
1313
const code = shellcode(true)
1414

1515
// PATH cleanup and setup
16-
expect(code).toContain('export PATH=$(echo "$PATH" | sed "s|$env_dir/bin:||g"')
16+
expect(code).toContain('export PATH=$(echo "$PATH" | /usr/bin/sed "s|$env_dir/bin:||g"')
1717
expect(code).toContain('export PATH="$env_dir/bin:$PATH"')
1818

1919
// Environment variables setup

0 commit comments

Comments
 (0)