admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle global tool specially when prepending PSHome to PATH (#24228)

Browse Source
This commit is contained in:
Dongbo Wang
2024-09-10 13:01:27 -07:00
committed by GitHub
parent 4a47d3582e
commit 7e27e63456
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+15 -3
View File
@@ -123,11 +123,23 @@ namespace Microsoft.PowerShell
throw new ConsoleHostStartupException(ConsoleHostStrings.ShellCannotBeStartedWithConfigConflict);
}
// put PSHOME in front of PATH so that calling `powershell` within `powershell` always starts the same running version
// Put PSHOME in front of PATH so that calling `pwsh` within `pwsh` always starts the same running version.
string path = Environment.GetEnvironmentVariable("PATH");
string pshome = Utils.DefaultPowerShellAppBase + Path.PathSeparator;
string pshome = Utils.DefaultPowerShellAppBase;
string dotnetToolsPathSegment = $"{Path.DirectorySeparatorChar}.store{Path.DirectorySeparatorChar}powershell{Path.DirectorySeparatorChar}";
// to not impact startup perf, we don't remove duplicates, but we avoid adding a duplicate to the front
int index = pshome.IndexOf(dotnetToolsPathSegment, StringComparison.Ordinal);
if (index > 0)
{
// We're running PowerShell global tool. In this case the real entry executable should be the 'pwsh'
// or 'pwsh.exe' within the tool folder which should be the path right before the '\.store', not what
// PSHome is pointing to.
pshome = pshome[0..index];
}
pshome += Path.PathSeparator;
// To not impact startup perf, we don't remove duplicates, but we avoid adding a duplicate to the front
// we also don't handle the edge case where PATH only contains $PSHOME
if (string.IsNullOrEmpty(path))
{