Skip to content

Change exec from alias to function to handle arbitrary args #18567

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
daxian-dbw merged 6 commits into from
Nov 17, 2022
Merged

Change exec from alias to function to handle arbitrary args #18567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dbb704
Change `exec` from alias to function to handle arbitrary args
SteveL-MSFT Nov 15, 2022
0956bb7
remove `exec` from alias testsy
SteveL-MSFT Nov 15, 2022
a14cae1
Update test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
SteveL-MSFT Nov 15, 2022
357267f
Update src/System.Management.Automation/engine/InitialSessionState.cs
daxian-dbw Nov 16, 2022
9f95aa8
address Ilya's feedback
SteveL-MSFT Nov 17, 2022
5d63fbc
rename variable
daxian-dbw Nov 17, 2022
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
17 changes: 13 additions & 4 deletions src/System.Management.Automation/engine/InitialSessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4078,6 +4078,15 @@ internal static string GetClearHostFunctionText()
}
}

#if UNIX
internal static string GetExecFunctionText()
{
return @"
Switch-Process -WithCommand $args
";
}
#endif

/// <summary>
/// This is the default function to use for man/help. It uses
/// splatting to pass in the parameters.
Expand Down Expand Up @@ -4683,10 +4692,6 @@ internal static SessionStateAliasEntry[] BuiltInAliases
new SessionStateAliasEntry("sls", "Select-String"),
};

#if UNIX
builtInAliases.Add(new SessionStateAliasEntry("exec", "Switch-Process"));
#endif

return builtInAliases.ToArray();
}
}
Expand Down Expand Up @@ -4716,6 +4721,10 @@ internal static SessionStateAliasEntry[] BuiltInAliases
SessionStateFunctionEntry.GetDelayParsedFunctionEntry("help", GetHelpPagingFunctionText(), isProductCode: true, languageMode: systemLanguageMode),
SessionStateFunctionEntry.GetDelayParsedFunctionEntry("prompt", DefaultPromptFunctionText, isProductCode: true, languageMode: systemLanguageMode),

#if UNIX
SessionStateFunctionEntry.GetDelayParsedFunctionEntry("exec", GetExecFunctionText(), isProductCode: true, languageMode: systemLanguageMode),
#endif

// Functions that require full language mode and are trusted
SessionStateFunctionEntry.GetDelayParsedFunctionEntry("Clear-Host", GetClearHostFunctionText(), isProductCode: true, languageMode: PSLanguageMode.FullLanguage),
SessionStateFunctionEntry.GetDelayParsedFunctionEntry("TabExpansion2", s_tabExpansionFunctionText, isProductCode: true, languageMode: PSLanguageMode.FullLanguage),
Expand Down
13 changes: 9 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
$global:PSDefaultParameterValues = $originalDefaultParameterValues
}

It 'Exec alias should map to Switch-Process' {
$alias = Get-Command exec
$alias | Should -BeOfType [System.Management.Automation.AliasInfo]
$alias.Definition | Should -BeExactly 'Switch-Process'
It 'Exec function should map to Switch-Process' {
$func = Get-Command exec
$func | Should -BeOfType [System.Management.Automation.CommandInfo]
$func.Definition | Should -Not -BeNullOrEmpty
}

It 'Exec by itself does nothing' {
Expand Down Expand Up @@ -60,6 +60,11 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
$env = pwsh -noprofile -outputformat text -command { $env:TEST_FOO='my test = value'; Switch-Process bash -c 'echo $TEST_FOO' }
$env | Should -BeExactly 'my test = value'
}

It 'The command can include a -w parameter' {
$out = pwsh -noprofile -outputformat text -command { exec /bin/echo 1 -w 2 }
$out | Should -BeExactly '1 -w 2'
}
}

Describe 'Switch-Process for Windows' -Tag 'CI' {
Expand Down
1 change: 0 additions & 1 deletion test/powershell/engine/Basic/DefaultCommands.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ Describe "Verify approved aliases list" -Tags "CI" {
"Alias", "epsn", "Export-PSSession", $($FullCLR ), "", "", ""
"Alias", "erase", "Remove-Item", $($FullCLR -or $CoreWindows -or $CoreUnix), "", "", ""
"Alias", "etsn", "Enter-PSSession", $($FullCLR -or $CoreWindows -or $CoreUnix), "", "", ""
"Alias", "exec", "Switch-Process", $( $CoreUnix), "", "", ""
"Alias", "exsn", "Exit-PSSession", $($FullCLR -or $CoreWindows -or $CoreUnix), "", "", ""
"Alias", "fc", "Format-Custom", $($FullCLR -or $CoreWindows -or $CoreUnix), "ReadOnly", "", ""
"Alias", "fhx", "Format-Hex", $($FullCLR -or $CoreWindows -or $CoreUnix), "", "", ""
Expand Down