Skip to content

Set-Location should use path with wildcard characters if it exists instead of globbing #5839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 4 commits into from
Jan 17, 2018
Merged

Set-Location should use path with wildcard characters if it exists instead of globbing #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7912fe
When InitialSessionState initializes it tries to SetLocation to curre…
SteveL-MSFT Jan 10, 2018
9cfd19c
fix test
SteveL-MSFT Jan 10, 2018
38e4cf9
address feedback
SteveL-MSFT Jan 11, 2018
cc24a84
[feature]
SteveL-MSFT Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/System.Management.Automation/namespaces/LocationGlobber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,20 @@ private Collection<PathInfo> ResolveDriveQualifiedPath(

Collection<string> stringResult = new Collection<string>();

// if the directory exists, just return it
try
{
if (Utils.NativeDirectoryExists(userPath))
{
result.Add(new PathInfo(drive, provider, userPath, _sessionState));
return result;
}
}
catch
{
// in cases of Access Denied or other errors, fallback to previous behavior and let provider handle it
}

if (!context.SuppressWildcardExpansion)
{
// See if the provider will expand the wildcard
Expand Down
23 changes: 23 additions & 0 deletions test/powershell/Host/Base-Directory.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,26 @@ Describe "Configuration file locations" -tags "CI","Slow" {
}
}
}

Describe "Working directory on startup" -Tag "CI" {
BeforeAll {
$powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
$testPath = New-Item -ItemType Directory -Path "$TestDrive\test[dir]"
$currentDirectory = Get-Location
}

AfterAll {
Set-Location $currentDirectory
}

It "Can start in directory where name contains wildcard characters" {
Set-Location -LiteralPath $testPath.FullName
if ($IsMacOS) {
# on macOS, /tmp is a symlink to /private so the real path is under /private/tmp
$expectedPath = "/private" + $testPath.FullName
} else {
$expectedPath = $testPath.FullName
}
& $powershell -noprofile -c { $PWD.Path } | Should BeExactly $expectedPath
}
}
10 changes: 10 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Set-Location.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ Describe "Set-Location" -Tags "CI" {
$result | Should BeOfType System.Management.Automation.PathInfo
}

It "Should accept path containing wildcard characters" {
$null = New-Item -ItemType Directory -Path "$TestDrive\aa"
$null = New-Item -ItemType Directory -Path "$TestDrive\ba"
$testPath = New-Item -ItemType Directory -Path "$TestDrive\[ab]a"

Set-Location $TestDrive
Set-Location -Path "[ab]a"
$(Get-Location).Path | Should BeExactly $testPath.FullName
}

Context 'Set-Location with no arguments' {

It 'Should go to $env:HOME when Set-Location run with no arguments from FileSystem provider' {
Expand Down