From 408c436422efb341c67b1e5e6108f2d26eab5183 Mon Sep 17 00:00:00 2001
From: zveinn <info@sveinn.is>
Date: Mon, 22 Apr 2024 06:01:07 -0700
Subject: [PATCH 1/3] enabling MC_DISABLE_PAGER and --dp

---
 cmd/flags.go   |  2 +-
 cmd/globals.go | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cmd/flags.go b/cmd/flags.go
index dc106019c1..c48117fc82 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -41,7 +41,7 @@ var globalFlags = []cli.Flag{
 	cli.BoolFlag{
 		Name:   "disable-pager, dp",
 		Usage:  "disable mc internal pager and print to raw stdout",
-		EnvVar: envPrefix + "DISABLE_PAGER",
+		EnvVar: envPrefix + globalDisablePagerEnv,
 		Hidden: true,
 	},
 	cli.BoolFlag{
diff --git a/cmd/globals.go b/cmd/globals.go
index 5add31f8da..b25a3cacca 100644
--- a/cmd/globals.go
+++ b/cmd/globals.go
@@ -22,6 +22,7 @@ import (
 	"context"
 	"crypto/x509"
 	"net/url"
+	"os"
 	"time"
 
 	"github.com/charmbracelet/lipgloss"
@@ -89,17 +90,23 @@ var (
 	// Terminal height/width, zero if not found
 	globalTermWidth, globalTermHeight int
 
-	globalDisablePagerFlag = "--disable-pager"
-	globalPagerDisabled    = false
-	globalHelpPager        *termPager
+	globalDisablePagerEnv       = "DISABLE_PAGER"
+	globalDisablePagerFlag      = "--disable-pager"
+	globalDisablePagerFlagShort = "--dp"
+	globalPagerDisabled         = false
+	globalHelpPager             *termPager
 
 	// CA root certificates, a nil value means system certs pool will be used
 	globalRootCAs *x509.CertPool
 )
 
 func parsePagerDisableFlag(args []string) {
+	disableEnv := os.Getenv(envPrefix + globalDisablePagerEnv)
+	if disableEnv == "true" {
+		globalPagerDisabled = true
+	}
 	for _, arg := range args {
-		if arg == globalDisablePagerFlag {
+		if arg == globalDisablePagerFlag || arg == globalDisablePagerFlagShort {
 			globalPagerDisabled = true
 		}
 	}

From bb5d9bb6578abe8718b9de66f1b33b6809e41441 Mon Sep 17 00:00:00 2001
From: Sveinn <info@sveinn.is>
Date: Mon, 22 Apr 2024 13:27:22 +0000
Subject: [PATCH 2/3] Update cmd/globals.go

Co-authored-by: Klaus Post <klauspost@gmail.com>
---
 cmd/globals.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmd/globals.go b/cmd/globals.go
index b25a3cacca..47cc037cfe 100644
--- a/cmd/globals.go
+++ b/cmd/globals.go
@@ -101,10 +101,7 @@ var (
 )
 
 func parsePagerDisableFlag(args []string) {
-	disableEnv := os.Getenv(envPrefix + globalDisablePagerEnv)
-	if disableEnv == "true" {
-		globalPagerDisabled = true
-	}
+	globalPagerDisabled, _ = strconv.ParseBool(os.Getenv(envPrefix + globalDisablePagerEnv))
 	for _, arg := range args {
 		if arg == globalDisablePagerFlag || arg == globalDisablePagerFlagShort {
 			globalPagerDisabled = true

From 0dbbdf24e82e3105dde60ca2e13390efb2274196 Mon Sep 17 00:00:00 2001
From: zveinn <info@sveinn.is>
Date: Mon, 22 Apr 2024 06:30:22 -0700
Subject: [PATCH 3/3] adding missing import

---
 cmd/globals.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/globals.go b/cmd/globals.go
index 47cc037cfe..14161d4e22 100644
--- a/cmd/globals.go
+++ b/cmd/globals.go
@@ -23,6 +23,7 @@ import (
 	"crypto/x509"
 	"net/url"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/charmbracelet/lipgloss"