diff --git a/cmd/up.go b/cmd/up.go index 4823f80bda..66585ccb2f 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -118,7 +118,6 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) { configExists, _ := configutil.ConfigExists() if !configExists { - log.Info("Config does not exist") initFlags := &InitCmdFlags{ reconfigure: false, overwrite: false, diff --git a/pkg/devspace/config/configutil/get.go b/pkg/devspace/config/configutil/get.go index 0c0dd3e18b..397fa51bf3 100644 --- a/pkg/devspace/config/configutil/get.go +++ b/pkg/devspace/config/configutil/get.go @@ -54,9 +54,7 @@ var setDefaultsOnce sync.Once // ConfigExists checks whether the yaml file for the config exists func ConfigExists() (bool, error) { - workdir, _ := os.Getwd() - - _, err := os.Stat(workdir + ConfigPath) + _, err := os.Stat(ConfigPath) if os.IsNotExist(err) { return false, nil } else if err != nil { diff --git a/pkg/devspace/config/configutil/load.go b/pkg/devspace/config/configutil/load.go index 8615c3c7a6..b066f7b1cf 100644 --- a/pkg/devspace/config/configutil/load.go +++ b/pkg/devspace/config/configutil/load.go @@ -2,16 +2,13 @@ package configutil import ( "io/ioutil" - "os" - "path/filepath" "github.com/covexo/devspace/pkg/devspace/config/v1" yaml "gopkg.in/yaml.v2" ) func loadConfig(config *v1.Config, path string) error { - workdir, _ := os.Getwd() - yamlFileContent, err := ioutil.ReadFile(filepath.Join(workdir, path)) + yamlFileContent, err := ioutil.ReadFile(path) if err != nil { return err } diff --git a/pkg/devspace/config/configutil/save.go b/pkg/devspace/config/configutil/save.go index 46a8768199..ec28a9b6da 100644 --- a/pkg/devspace/config/configutil/save.go +++ b/pkg/devspace/config/configutil/save.go @@ -16,8 +16,6 @@ func SaveConfig() error { return nil } - workdir, _ := os.Getwd() - // default and overwrite values configToIgnore := makeConfig() @@ -42,7 +40,7 @@ func SaveConfig() error { return err } - configDir := filepath.Dir(filepath.Join(workdir, ConfigPath)) + configDir := filepath.Dir(ConfigPath) os.MkdirAll(configDir, os.ModePerm) // Check if .gitignore exists @@ -51,7 +49,7 @@ func SaveConfig() error { fsutil.WriteToFile([]byte(configGitignore), filepath.Join(configDir, ".gitignore")) } - writeErr := ioutil.WriteFile(filepath.Join(workdir, ConfigPath), configYaml, os.ModePerm) + writeErr := ioutil.WriteFile(ConfigPath, configYaml, os.ModePerm) if writeErr != nil { return writeErr } @@ -62,7 +60,7 @@ func SaveConfig() error { return err } - return ioutil.WriteFile(filepath.Join(workdir, OverwriteConfigPath), overwriteConfigYaml, os.ModePerm) + return ioutil.WriteFile(OverwriteConfigPath, overwriteConfigYaml, os.ModePerm) } return nil