From f2286d48ff1197b6f02794d911829e9f6ce36fe5 Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Sun, 26 Dec 2021 23:24:01 +0100 Subject: [PATCH] cli: Fix support for reading input from stdin - prefer file input Apparently that way of detecting data on stdin is not really fool proof. Instead of improving that let's just swap the order and look for a file first. yolo. --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 946761d..94b710f 100644 --- a/main.go +++ b/main.go @@ -82,8 +82,6 @@ func render(args []string) { r, path, format := io.Reader(nil), "", "" if fi, err := os.Stdin.Stat(); err != nil { log.Fatal(err) - } else if fi.Mode()&os.ModeCharDevice == 0 { - r, path, format = os.Stdin, "./STDIN", args[0] } else if len(args) == 2 { f, err := os.Open(args[0]) if err != nil { @@ -91,6 +89,8 @@ func render(args []string) { } defer f.Close() r, path, format = f, args[0], args[1] + } else if fi.Mode()&os.ModeCharDevice == 0 { + r, path, format = os.Stdin, "./STDIN", args[0] } else { log.Fatal(usage) }