STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3789 from cristiand391/increase-gh-pager-precedence

Browse source 
Increase `GH_PAGER` precedence
This commit is contained in:
Sam 2021-06-15 09:18:57 -04:00 • committed by GitHub
commit e380d68ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/gh/main.go
View file

@ -96,8 +96,9 @@ func mainRun() exitCode {
if prompt, _ := cfg.Get("", "prompt"); prompt == "disabled" {
cmdFactory.IOStreams.SetNeverPrompt(true)
}
if pager, _ := cfg.Get("", "pager"); pager != "" {
if ghPager, ghPagerExists := os.LookupEnv("GH_PAGER"); ghPagerExists {
cmdFactory.IOStreams.SetPager(ghPager)
} else if pager, _ := cfg.Get("", "pager"); pager != "" {
cmdFactory.IOStreams.SetPager(pager)
}

7
pkg/iostreams/iostreams.go
View file

@ -281,12 +281,7 @@ func System() *IOStreams {
stdoutIsTTY := isTerminal(os.Stdout)
stderrIsTTY := isTerminal(os.Stderr)
var pagerCommand string
if ghPager, ghPagerExists := os.LookupEnv("GH_PAGER"); ghPagerExists {
pagerCommand = ghPager
} else {
pagerCommand = os.Getenv("PAGER")
}
pagerCommand := os.Getenv("PAGER")
io := &IOStreams{
In: os.Stdin,