Skip to content

Commit

Permalink
Merge pull request #160 from cupcakearmy/1.5.3
Browse files Browse the repository at this point in the history
1.5.3
  • Loading branch information
cupcakearmy authored Feb 16, 2022
2 parents a373c07 + 92feaef commit 75160d4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.5.3] - 2022-02-13

### Fixed

- Error throwing not finding config even it's not being used.

## [1.5.2] - 2022-02-13

### Fixed
Expand Down
14 changes: 3 additions & 11 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cmd

import (
"fmt"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -80,20 +79,13 @@ func initConfig() {
configPaths = append(configPaths, xdgConfig)
}
for _, cfgPath := range configPaths {
if internal.VERBOSE {
colors.Faint.Printf("> Adding config path: '%s'\n", cfgPath)
}
viper.AddConfigPath(cfgPath)
}
if internal.VERBOSE {
colors.Faint.Printf("Using config paths: %s\n", strings.Join(configPaths, " "))
}
cfgFileName := ".autorestic"
viper.SetConfigName(cfgFileName)
viper.AutomaticEnv()
if viper.ConfigFileUsed() == "" {
colors.Error.Println(
fmt.Sprintf(
"cannot find configuration file '%s.yml' or '%s.yaml' in config paths: ['%s']",
cfgFileName, cfgFileName, strings.Join(configPaths, "', '")))
os.Exit(1)
}
}
}
9 changes: 7 additions & 2 deletions internal/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/spf13/viper"
)

const VERSION = "1.5.2"
const VERSION = "1.5.3"

var CI bool = false
var VERBOSE bool = false
Expand Down Expand Up @@ -63,7 +63,12 @@ func GetConfig() *Config {
}
}
} else {
return
cfgFileName := ".autorestic"
colors.Error.Println(
fmt.Sprintf(
"cannot find configuration file '%s.yml' or '%s.yaml'.",
cfgFileName, cfgFileName))
os.Exit(1)
}

var versionConfig interface{}
Expand Down

1 comment on commit 75160d4

@vercel
Copy link

@vercel vercel bot commented on 75160d4 Feb 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.