nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): ensure provided config path is used (#461)

Browse Source
This commit is contained in:
1138-4EB 2018-08-09 18:53:34 +01:00
parent 714876e3d0
commit 346763caea
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/filebrowser/main.go
View File

@ -117,9 +117,6 @@ func setupViper() {
viper.BindPFlag("AlternativeRecaptcha", flag.Lookup("alternative-recaptcha")) viper.BindPFlag("AlternativeRecaptcha", flag.Lookup("alternative-recaptcha"))
viper.BindPFlag("ReCaptchaKey", flag.Lookup("recaptcha-key")) viper.BindPFlag("ReCaptchaKey", flag.Lookup("recaptcha-key"))
viper.BindPFlag("ReCaptchaSecret", flag.Lookup("recaptcha-secret")) viper.BindPFlag("ReCaptchaSecret", flag.Lookup("recaptcha-secret"))
viper.SetConfigName("filebrowser")
viper.AddConfigPath(".")
} }
func printVersion() { func printVersion() {
@ -137,16 +134,15 @@ func main() {
// Add a configuration file if set. // Add a configuration file if set.
if config != "" { if config != "" {
ext := filepath.Ext(config) cfg := strings.TrimSuffix(config, filepath.Ext(config))
dir := filepath.Dir(config) if dir := filepath.Dir(cfg); dir != "" {
config = strings.TrimSuffix(config, ext)
if dir != "" {
viper.AddConfigPath(dir) viper.AddConfigPath(dir)
config = strings.TrimPrefix(config, dir) cfg = strings.TrimPrefix(cfg, dir)
} }
viper.SetConfigName(cfg)
viper.SetConfigName(config) } else {
viper.SetConfigName("filebrowser")
viper.AddConfigPath(".")
} }
// Read configuration from a file if exists. // Read configuration from a file if exists.