github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: env key replacer and remove unused function (#5547)

pull/5548/head
Henrique Dias 2025-11-15 08:40:37 +01:00 committed by GitHub
parent 4e9e312984
commit 13814e1119
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/root.go
View File

@ -534,8 +534,7 @@ func initConfig() {
v.SetEnvPrefix("FB") v.SetEnvPrefix("FB")
v.AutomaticEnv() v.AutomaticEnv()
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
if err := v.ReadInConfig(); err != nil { if err := v.ReadInConfig(); err != nil {
var configParseError v.ConfigParseError var configParseError v.ConfigParseError

16
cmd/utils.go
View File

@ -23,16 +23,8 @@ import (
const dbPerms = 0640 const dbPerms = 0640
func returnErr(err error) error {
if err != nil {
return err
}
return nil
}
func getString(flags *pflag.FlagSet, flag string) (string, error) { func getString(flags *pflag.FlagSet, flag string) (string, error) {
s, err := flags.GetString(flag) return flags.GetString(flag)
return s, returnErr(err)
} }
func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) { func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) {
@ -48,13 +40,11 @@ func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) {
} }
func getBool(flags *pflag.FlagSet, flag string) (bool, error) { func getBool(flags *pflag.FlagSet, flag string) (bool, error) {
b, err := flags.GetBool(flag) return flags.GetBool(flag)
return b, returnErr(err)
} }
func getUint(flags *pflag.FlagSet, flag string) (uint, error) { func getUint(flags *pflag.FlagSet, flag string) (uint, error) {
b, err := flags.GetUint(flag) return flags.GetUint(flag)
return b, returnErr(err)
} }
func generateKey() []byte { func generateKey() []byte {