From a8bfa115fb7186643258d1d654b770c9773bff4a Mon Sep 17 00:00:00 2001 From: tjp Date: Fri, 5 Jan 2024 10:02:07 -0700 Subject: auto_pager bool to pager string always/auto/never --- actions.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'actions.go') diff --git a/actions.go b/actions.go index 08838a8..09e6a07 100644 --- a/actions.go +++ b/actions.go @@ -440,20 +440,27 @@ func print(state *BrowserState) error { out = state.Modal } - if state.AutoPager { + lessarg := []string{} + switch state.Pager { + case "auto": + lessarg = []string{"-F"} + fallthrough + case "always": less, err := exec.LookPath("less") if err != nil { return err } - cmd := exec.Command(less, "-F") + cmd := exec.Command(less, lessarg...) cmd.Stdin = bytes.NewBuffer(out) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr return cmd.Run() + case "never": + _, err := os.Stdout.Write(out) + return err } - _, err := os.Stdout.Write(out) - return err + return errors.New("invalid 'pager' value in configuration") } func Print(state *BrowserState) error { -- cgit v1.2.3