From d46933abf2566827ffbd75e4cfa21c9e8652a474 Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Tue, 28 Dec 2021 16:44:05 -0800 Subject: [PATCH] Use os.Stat instead of os.ReadDir as that was added in 1.16 --- main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 25f996b1..4797c0b4 100644 --- a/main.go +++ b/main.go @@ -719,8 +719,8 @@ func flashUF2UsingMSD(volume, tmppath string, options *compileopts.Options) erro var infoPath string switch runtime.GOOS { case "linux", "freebsd": - _, err := os.ReadDir("/run/media") - if err != nil { + fi, err := os.Stat("/run/media") + if err != nil || !fi.IsDir() { infoPath = "/media/*/" + volume + "/INFO_UF2.TXT" } else { infoPath = "/run/media/*/" + volume + "/INFO_UF2.TXT" @@ -748,11 +748,11 @@ func flashHexUsingMSD(volume, tmppath string, options *compileopts.Options) erro var destPath string switch runtime.GOOS { case "linux", "freebsd": - _, err := os.ReadDir("/run/media") - if err != nil { - infoPath = "/media/*/" + volume + fi, err := os.Stat("/run/media") + if err != nil || !fi.IsDir() { + destPath = "/media/*/" + volume } else { - infoPath = "/run/media/*/" + volume + destPath = "/run/media/*/" + volume } case "darwin": destPath = "/Volumes/" + volume