From 2f2fe6124bc99ed025f6eba917f745e297d5a7dc Mon Sep 17 00:00:00 2001 From: Vladimir Bauer Date: Sun, 27 Feb 2022 14:29:33 +0500 Subject: [PATCH 1/2] return scanner.Err() --- kak/kak.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kak/kak.go b/kak/kak.go index c726eb5..d5eeeef 100644 --- a/kak/kak.go +++ b/kak/kak.go @@ -81,7 +81,7 @@ func Sessions() (sessions []Session, err error) { } } - return + return sessions, scanner.Err() } func clearSessions() error { From 6205aa088c0db4b0e67fd45fa534663bfad7597e Mon Sep 17 00:00:00 2001 From: Vladimir Bauer Date: Sun, 27 Feb 2022 14:31:12 +0500 Subject: [PATCH 2/2] inline clearSessions --- kak/kak.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/kak/kak.go b/kak/kak.go index d5eeeef..4ce0fdc 100644 --- a/kak/kak.go +++ b/kak/kak.go @@ -67,7 +67,7 @@ func Sessions() (sessions []Session, err error) { return } - err = clearSessions() + err = exec.Command(kakExec, "-clear").Run() if err != nil { return } @@ -84,20 +84,6 @@ func Sessions() (sessions []Session, err error) { return sessions, scanner.Err() } -func clearSessions() error { - kakExec, err := kakExec() - if err != nil { - return err - } - - err = exec.Command(kakExec, "-clear").Run() - if err != nil { - return err - } - - return nil -} - func kakExec() (kakExec string, err error) { kakExec, err = exec.LookPath("kak") if err != nil {