Skip to content

Commit db7ed20

Browse files
committed
wip
1 parent 7fdced9 commit db7ed20

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

packages/cli/install.ps1

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -965,17 +965,15 @@ exec "`$VP_HOME/current/bin/vp.exe" "`$@"
965965
# Cleanup old versions
966966
Cleanup-OldVersions -InstallDir $InstallDir
967967

968-
# Configure Windows-native shell access via the User PATH
969-
$pathResult = Configure-UserPath
970-
971-
# Configure Nushell autoload if Nushell is installed
972-
$nushellResult = Configure-Nushell
973-
974968
# Setup Node.js version manager (shims) - separate component
975969
$nodeManagerResult = Setup-NodeManager -BinDir $BinDir
976970

977971
Prompt-RemovePreviousInstallDir -PreviousInstallDir $previousInstallDir
978972

973+
# Configure shell access after the install is otherwise complete.
974+
$pathResult = Configure-UserPath
975+
$nushellResult = Configure-Nushell
976+
979977
# Use ~ shorthand if install dir is under USERPROFILE, otherwise show full path
980978
$displayDir = $InstallDir -replace [regex]::Escape($env:USERPROFILE), '~'
981979

packages/cli/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,14 +1209,14 @@ WRAPPER_EOF
12091209
fi
12101210
"$vp_bin" env setup --env-only > /dev/null
12111211

1212-
# Configure shell PATH (always attempted)
1213-
configure_shell_path
1214-
12151212
# Setup Node.js version manager (shims) - separate component
12161213
setup_node_manager "$BIN_DIR"
12171214

12181215
prompt_remove_previous_install_dir "$previous_install_dir"
12191216

1217+
# Configure shell PATH after the install is otherwise complete.
1218+
configure_shell_path
1219+
12201220
# Use ~ shorthand if install dir is under HOME, otherwise show full path
12211221
local display_dir="${INSTALL_DIR/#$HOME/~}"
12221222
local display_location="${display_dir}/bin"

0 commit comments

Comments
 (0)