feat(config): parse jsonc config files

resolves #4097
JanDeDobbeleer · Jul 27, 2023 · 3a580ff · 3a580ff
1 parent 344c9b6
commit 3a580ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/engine/config.go b/src/engine/config.go
@@ -133,12 +133,17 @@ func loadConfig(env platform.Environment) *Config {
 	cfg.origin = configFile
 	cfg.Format = strings.TrimPrefix(filepath.Ext(configFile), ".")
 	cfg.env = env
-	if cfg.Format == "yml" {
+
+	// support different extensions
+	switch cfg.Format {
+	case "yml":
 		cfg.Format = YAML
+	case "jsonc":
+		cfg.Format = JSON
 	}
 
-	config.AddDriver(yaml.Driver)
-	config.AddDriver(json.Driver)
+	config.AddDriver(yaml.Driver.WithAliases("yaml", "yml"))
+	config.AddDriver(json.Driver.WithAliases("json", "jsonc"))
 	config.AddDriver(toml.Driver)
 
 	if config.Default().IsEmpty() {

diff --git a/src/platform/shell.go b/src/platform/shell.go
@@ -632,9 +632,10 @@ func (env *Shell) Flags() *Flags {
 
 func (env *Shell) Shell() string {
 	defer env.Trace(time.Now())
-	if env.CmdFlags.Shell != "" {
+	if len(env.CmdFlags.Shell) != 0 {
 		return env.CmdFlags.Shell
 	}
+	env.Debug("no shell name provided in flags, trying to detect it")
 	pid := os.Getppid()
 	p, _ := process.NewProcess(int32(pid))
 	name, err := p.Name()