diff --git a/cmd/gh/main.go b/cmd/gh/main.go index 72b635810..891d4b98f 100644 --- a/cmd/gh/main.go +++ b/cmd/gh/main.go @@ -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) } diff --git a/pkg/iostreams/iostreams.go b/pkg/iostreams/iostreams.go index d6717ca8a..ec2503151 100644 --- a/pkg/iostreams/iostreams.go +++ b/pkg/iostreams/iostreams.go @@ -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,