From a3bc6113eb1193a35fa3d93a3a1afd4dd4aa380d Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Tue, 20 Feb 2024 17:51:21 +0800 Subject: [PATCH] Opt: add env file overload option flag --- cmd/flags/config.go | 2 ++ cmd/root.go | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/flags/config.go b/cmd/flags/config.go index 0f047c3..a5ea9c2 100644 --- a/cmd/flags/config.go +++ b/cmd/flags/config.go @@ -8,6 +8,8 @@ var ( SkipEnv bool + EnvFileOverload bool + SkipConfig bool EnvNoPrefix bool diff --git a/cmd/root.go b/cmd/root.go index 361483e..12214b7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -36,8 +36,13 @@ var RootCmd = &cobra.Command{ s = append(s, ss...) } if len(s) != 0 { - log.Infof("Overload env from: %v", s) - err = godotenv.Overload(s...) + if flags.EnvFileOverload { + log.Infof("overload env from: %v", s) + err = godotenv.Overload(s...) + } else { + log.Infof("load env from: %v", s) + err = godotenv.Load(s...) + } if err != nil { logrus.Fatalf("load env error: %v", err) } @@ -58,6 +63,7 @@ func init() { RootCmd.PersistentFlags().BoolVar(&flags.EnvNoPrefix, "env-no-prefix", false, "env no SYNCTV_ prefix") RootCmd.PersistentFlags().BoolVar(&flags.SkipConfig, "skip-config", false, "skip config") RootCmd.PersistentFlags().BoolVar(&flags.SkipEnv, "skip-env", false, "skip env") + RootCmd.PersistentFlags().BoolVar(&flags.EnvFileOverload, "env-file-overload", false, "env file overload") RootCmd.PersistentFlags().StringVar(&flags.GitHubBaseURL, "github-base-url", "https://api.github.com/", "github api base url") home, err := homedir.Dir() if err != nil {