mirrors/filebrowser
1
0
Fork 0
mirror of https://github.com/filebrowser/filebrowser.git synced 2025-11-26 14:25:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix config flag

Browse Source
This commit is contained in:
Henrique Dias
2017-07-29 14:57:45 +01:00
parent e09bd03eec
commit 2334bb601d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/filemanager/main.go
View File

@@ -35,7 +35,7 @@ var (
) )
func init() { func init() {
flag.StringVarP(&config, "config", "c", "", "JSON configuration file") flag.StringVarP(&config, "config", "c", "", "Configuration file")
flag.IntVarP(&port, "port", "p", 0, "HTTP Port (default is random)") flag.IntVarP(&port, "port", "p", 0, "HTTP Port (default is random)")
flag.StringVarP(&addr, "address", "a", "", "Address to listen to (default is all of them)") flag.StringVarP(&addr, "address", "a", "", "Address to listen to (default is all of them)")
flag.StringVarP(&database, "database", "d", "./filemanager.db", "Database file") flag.StringVarP(&database, "database", "d", "./filemanager.db", "Database file")
@@ -81,7 +81,16 @@ func main() {
// Add a configuration file if set. // Add a configuration file if set.
if config != "" { if config != "" {
viper.SetConfigName(strings.TrimSuffix(config, filepath.Ext(config))) ext := filepath.Ext(config)
dir := filepath.Dir(config)
config = strings.TrimSuffix(config, ext)
if dir != "" {
viper.AddConfigPath(dir)
config = strings.TrimPrefix(config, dir)
}
viper.SetConfigName(config)
} }
// Read configuration from a file if exists. // Read configuration from a file if exists.