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

samcoe · web-flow · commit e380d68ed2d6 · 2021-06-15T09:18:57.000-04:00
Increase `GH_PAGER` precedence
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,9 @@ func mainRun() exitCode {`
`96`	`96`	`if prompt, _ := cfg.Get("", "prompt"); prompt == "disabled" {`
`97`	`97`	`cmdFactory.IOStreams.SetNeverPrompt(true)`
`98`	`98`	`}`
`99`		`-`
`100`		`- if pager, _ := cfg.Get("", "pager"); pager != "" {`
	`99`	`+ if ghPager, ghPagerExists := os.LookupEnv("GH_PAGER"); ghPagerExists {`
	`100`	`+ cmdFactory.IOStreams.SetPager(ghPager)`
	`101`	`+ } else if pager, _ := cfg.Get("", "pager"); pager != "" {`
`101`	`102`	`cmdFactory.IOStreams.SetPager(pager)`
`102`	`103`	`}`
`103`	`104`