Merge pull request #166 from fahedouch/update-compose-env-var

ndeloof · web-flow · commit c78dcffd54c5 · 2021-08-27T07:45:50.000+02:00
diff --git a/cli/options.go b/cli/options.go
@@ -188,14 +188,19 @@ func WithDotEnv(o *ProjectOptions) error {
 
 	s, err := os.Stat(dotEnvFile)
 	if os.IsNotExist(err) {
+		if o.EnvFile != "" {
+			return errors.Errorf("Couldn't find env file: %s", o.EnvFile)
+		}
 		return nil
 	}
 	if err != nil {
 		return err
 	}
 
 	if s.IsDir() {
-		return nil
+		if o.EnvFile != "" {
+			return errors.Errorf("%s is a directory", dotEnvFile)
+		}
 	}
 
 	file, err := os.Open(dotEnvFile)

Original file line number	Diff line number	Diff line change
`@@ -188,14 +188,19 @@ func WithDotEnv(o *ProjectOptions) error {`
`188`	`188`
`189`	`189`	`s, err := os.Stat(dotEnvFile)`
`190`	`190`	`if os.IsNotExist(err) {`
	`191`	`+ if o.EnvFile != "" {`
	`192`	`+ return errors.Errorf("Couldn't find env file: %s", o.EnvFile)`
	`193`	`+ }`
`191`	`194`	`return nil`
`192`	`195`	`}`
`193`	`196`	`if err != nil {`
`194`	`197`	`return err`
`195`	`198`	`}`
`196`	`199`
`197`	`200`	`if s.IsDir() {`
`198`		`- return nil`
	`201`	`+ if o.EnvFile != "" {`
	`202`	`+ return errors.Errorf("%s is a directory", dotEnvFile)`
	`203`	`+ }`
`199`	`204`	`}`
`200`	`205`
`201`	`206`	`file, err := os.Open(dotEnvFile)`