From 023f6b8ced0cfb1e8a606ac0de91f9f60bb84f92 Mon Sep 17 00:00:00 2001 From: Andrey Novikov Date: Wed, 6 Mar 2024 22:04:50 +0900 Subject: [PATCH] Upgrade godotenv module to support multiline vars in `.env` Fixes https://github.com/DarthSim/overmind/issues/172 Use another fork to keep up-to-date fix for https://github.com/DarthSim/overmind/issues/59 (waiting for upstream pull request https://github.com/joho/godotenv/pull/227 to be merged) --- go.mod | 4 +++- go.sum | 4 ++-- main.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index ecbedc8..206ce56 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/DarthSim/overmind/v2 go 1.21 require ( - github.com/DarthSim/godotenv v1.3.1 + github.com/joho/godotenv v1.5.1 github.com/matoous/go-nanoid v1.5.0 github.com/sevlyar/go-daemon v0.1.6 github.com/urfave/cli v1.22.12 @@ -16,3 +16,5 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect golang.org/x/sys v0.4.0 // indirect ) + +replace github.com/joho/godotenv => github.com/Envek/godotenv v0.0.0-20240306122526-83ef30cd3c69 diff --git a/go.sum b/go.sum index 60bb4a8..0dcbe31 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/DarthSim/godotenv v1.3.1 h1:NMWdswlRx2M9uPY4Ux8p/Q/rDs7A97OG89fECiQ/Tz0= -github.com/DarthSim/godotenv v1.3.1/go.mod h1:B3ySe1HYTUFFR6+TPyHyxPWjUdh48il0Blebg9p1cCc= +github.com/Envek/godotenv v0.0.0-20240306122526-83ef30cd3c69 h1:qcFwHMDPqNAmrSJZbXUWPJfNl2X3+Y8AWXLC8x9h6jw= +github.com/Envek/godotenv v0.0.0-20240306122526-83ef30cd3c69/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/main.go b/main.go index 0a5fadd..1fcaa8f 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "github.com/DarthSim/godotenv" "github.com/DarthSim/overmind/v2/start" + "github.com/joho/godotenv" "github.com/urfave/cli" )