Skip to content

put command discovery before scripts for Unix #5116

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
mirichmo merged 2 commits into from
Oct 24, 2017
Merged

put command discovery before scripts for Unix #5116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f79c1e
put command discovery before scripts for Unix
SteveL-MSFT Oct 14, 2017
c2f3013
remove unnecessary test
SteveL-MSFT Oct 14, 2017
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
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/CommandPathSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ internal CommandPathSearch(
// Porting note: on non-Windows platforms, we want to always allow just 'commandName'
// as an acceptable command name. However, we also want to allow commands to be
// called with the .ps1 extension, so that 'script.ps1' can be called by 'script'.
commandPatterns = new[] { commandName + ".ps1", commandName };
commandPatterns = new[] { commandName, commandName + ".ps1" };
}
_postProcessEnumeratedFiles = CheckAgainstAcceptableCommandNames;
_acceptableCommandNames = acceptableCommandNames;
Expand Down
42 changes: 27 additions & 15 deletions test/powershell/Language/Scripting/NativeExecution/NativeLinuxCommands.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
if ( $IsWindows ) {
$PesterSkipOrPending = @{ Skip = $true }
}
else {
$PesterSkipOrPending = @{}
}
Describe "NativeLinuxCommands" -tags "CI" {
It "Should return a type of 'string' for hostname cmdlet" {
$result = hostname
$result | Should Not BeNullOrEmpty
$result | Should BeOfType string
BeforeAll {
$originalDefaultParams = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues["It:Skip"] = $IsWindows
$originalPath = $env:PATH
$env:PATH += [IO.Path]::PathSeparator + $TestDrive
}

It "Should find Application grep" @PesterSkipOrPending {
AfterAll {
$global:PSDefaultParameterValues = $originalDefaultParams
$env:PATH = $originalPath
}

It "Should find Application grep" {
(get-command grep).CommandType | Should Be Application
}

It "Should pipe to grep and get result" @PesterSkipOrPending {
It "Should pipe to grep and get result" {
"hello world" | grep hello | Should Be "hello world"
}

It "Should find Application touch" @PesterSkipOrPending {
It "Should find Application touch" {
(get-command touch).CommandType | Should Be Application
}

It "Should not redirect standard input if native command is the first command in pipeline (1)" @PesterSkipOrPending {
It "Should not redirect standard input if native command is the first command in pipeline (1)" {
df | ForEach-Object -Begin { $out = @() } -Process { $out += $_ }
$out.Length -gt 0 | Should Be $true
$out[0] -like "Filesystem*Available*" | Should Be $true
}

It "Should not redirect standard input if native command is the first command in pipeline (2)" @PesterSkipOrPending {
It "Should not redirect standard input if native command is the first command in pipeline (2)" {
$out = df
$out.Length -gt 0 | Should Be $true
$out[0] -like "Filesystem*Available*" | Should Be $true
}

It "Should find command before script with same name" {
Set-Content "$TestDrive\foo" -Value @"
#!/usr/bin/env bash
echo 'command'
"@ -Encoding Ascii
chmod +x "$TestDrive/foo"
Set-Content "$TestDrive\foo.ps1" -Value @"
'script'
"@ -Encoding Ascii
foo | Should BeExactly 'command'
}
}

Describe "Scripts with extensions" -tags "CI" {
Expand Down