From ec0c2498a1c4a9feee302032bcc499b68f75ab41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 3 Nov 2019 19:14:16 +0000 Subject: [PATCH] cmd/gogio: fix a couple of staticcheck positives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spotted the javac one by chance when reading the code, so I ran the tool and fixed another small bug while at it. Signed-off-by: Daniel Martí --- cmd/gogio/androidbuild.go | 3 +++ cmd/gogio/main.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/gogio/androidbuild.go b/cmd/gogio/androidbuild.go index 435e2637..b6517283 100644 --- a/cmd/gogio/androidbuild.go +++ b/cmd/gogio/androidbuild.go @@ -151,6 +151,9 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro return errors.New("ANDROID_HOME is not set. Please point it to the root of the Android SDK") } javac, err := findJavaC() + if err != nil { + return fmt.Errorf("could not find javac: %v", err) + } ndkRoot := filepath.Join(androidHome, "ndk-bundle") if _, err := os.Stat(ndkRoot); err != nil { return fmt.Errorf("no NDK found in $ANDROID_HOME/ndk-bundle (%s). Use `sdkmanager ndk-bundle` to install it", ndkRoot) diff --git a/cmd/gogio/main.go b/cmd/gogio/main.go index e100c10f..8dc92b70 100644 --- a/cmd/gogio/main.go +++ b/cmd/gogio/main.go @@ -47,7 +47,7 @@ type buildInfo struct { func main() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, mainUsage) + fmt.Fprint(os.Stderr, mainUsage) } flag.Parse() if err := mainErr(); err != nil {