Merge pull request #12 from ttd2089/fix/avoid-init-order

fix: remove init functions to avoid order problems
ttd2089 · Jun 30, 2022 · 7dd27a9 · 7dd27a9
2 parents 0a07e7a + c39343c
commit 7dd27a9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/gitignore.go b/gitignore.go
@@ -10,7 +10,7 @@ import (
 // GitIgnoreSupported indicates whether the GitIgnored function is available.
 var GitIgnoreSupported = false
 
-func init() {
+func initGitignore() {
  if _, err := exec.LookPath("git"); err != nil {
  logger.Printf("gitignore not supported: %v", err)
  } else {

diff --git a/go.mod b/go.mod
@@ -1,9 +1,11 @@
-module github.com/ttd2089/pocket
-
-go 1.14
-
-require (
- github.com/fsnotify/fsnotify v1.4.9
- github.com/go-test/deep v1.0.6
- github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3
-)
+module github.com/ttd2089/pocket
+
+go 1.18
+
+require (
+ github.com/fsnotify/fsnotify v1.4.9
+ github.com/go-test/deep v1.0.6
+ github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3
+)
+
+require golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 // indirect
diff --git a/logger.go b/logger.go
diff --git a/main.go b/main.go
@@ -3,6 +3,7 @@ package main
 import (
  "fmt"
  "io"
+ "io/ioutil"
  "log"
  "os"
  "os/exec"
@@ -13,6 +14,15 @@ import (
 
 var productVersion = "0.0.0"
 
+var logger *log.Logger
+
+func init() {
+
+ logger = log.New(ioutil.Discard, "", log.LstdFlags)
+
+ initGitignore()
+}
+
 func main() {
 
  cli := getopt.New()

diff --git a/main_nonwindows.go b/main_nonwindows.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main