Skip to content

Enable $env:PAGER to work correctly if arguments are used #6144

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 2 commits into from
Feb 15, 2018
Merged

Enable $env:PAGER to work correctly if arguments are used #6144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4af741
parse $env:PAGER as command and args to work properly
SteveL-MSFT Feb 10, 2018
3b078bd
address PR feedback
SteveL-MSFT Feb 13, 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
7 changes: 4 additions & 3 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 @@ -4764,7 +4764,8 @@ internal static SessionStateAliasEntry[] BuiltInAliases

# Respect PAGER, use more on Windows, and use less on Linux
if (Test-Path env:PAGER) {
$moreCommand = (Get-Command -CommandType Application $env:PAGER | Select-Object -First 1).Definition
$pager,$moreArgs = $env:PAGER -split '\s+'
$moreCommand = (Get-Command -CommandType Application $pager | Select-Object -First 1).Definition
} elseif ($IsWindows) {
$moreCommand = (Get-Command -CommandType Application more | Select-Object -First 1).Definition
} else {
Expand All @@ -4773,9 +4774,9 @@ internal static SessionStateAliasEntry[] BuiltInAliases

if($paths) {
foreach ($file in $paths) {
Get-Content $file | & $moreCommand
Get-Content $file | & $moreCommand $moreArgs
}
} else { $input | & $moreCommand }
} else { $input | & $moreCommand $moreArgs }
";

internal const string DefaultSetDriveFunctionText = "Set-Location $MyInvocation.MyCommand.Name";
Expand Down