TrueCloudLab/rclone
16
0
Fork 4
Code Issues 3 Pull requests 2 Projects Releases 3 Packages Wiki Activity Actions

config: don't create default config dir when user supplies --config

Browse source 
Avoid creating empty default configuration directory when user supplies path to config file.

Fixes #2514.
This commit is contained in:
albertony 2018-09-03 16:30:53 +02:00 • committed by Nick Craig-Wood
parent ff0efb1501
commit 09d7bd2d40
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
fs/config/config.go
View file

@ -115,29 +115,31 @@ func makeConfigPath() string {
homedir = os.Getenv("HOME") homedir = os.Getenv("HOME")
} }
// Possibly find the user's XDG config paths // Find user's configuration directory.
// Prefer XDG config path, with fallback to $HOME/.config.
// See XDG Base Directory specification // See XDG Base Directory specification
// https://specifications.freedesktop.org/basedir-spec/latest/ // https://specifications.freedesktop.org/basedir-spec/latest/),
xdgdir := os.Getenv("XDG_CONFIG_HOME") xdgdir := os.Getenv("XDG_CONFIG_HOME")
var xdgcfgdir string var cfgdir string
if xdgdir != "" { if xdgdir != "" {
xdgcfgdir = filepath.Join(xdgdir, "rclone") // User's configuration directory for rclone is $XDG_CONFIG_HOME/rclone
cfgdir = filepath.Join(xdgdir, "rclone")
} else if homedir != "" { } else if homedir != "" {
xdgdir = filepath.Join(homedir, ".config") // User's configuration directory for rclone is $HOME/.config/rclone
xdgcfgdir = filepath.Join(xdgdir, "rclone") cfgdir = filepath.Join(homedir, ".config", "rclone")
} }
// Use $XDG_CONFIG_HOME/rclone/rclone.conf if already existing // Use rclone.conf from user's configuration directory if already existing
var xdgconf string var cfgpath string
if xdgcfgdir != "" { if cfgdir != "" {
xdgconf = filepath.Join(xdgcfgdir, configFileName) cfgpath = filepath.Join(cfgdir, configFileName)
_, err := os.Stat(xdgconf) _, err := os.Stat(cfgpath)
if err == nil { if err == nil {
return xdgconf return cfgpath
} }
} }
// Use $HOME/.rclone.conf if already existing // Use .rclone.conf from user's home directory if already existing
var homeconf string var homeconf string
if homedir != "" { if homedir != "" {
homeconf = filepath.Join(homedir, hiddenConfigFileName) homeconf = filepath.Join(homedir, hiddenConfigFileName)
@ -147,32 +149,39 @@ func makeConfigPath() string {
} }
} }
// Try to create $XDG_CONFIG_HOME/rclone/rclone.conf
if xdgconf != "" {
// xdgconf != "" implies xdgcfgdir != ""
err := os.MkdirAll(xdgcfgdir, os.ModePerm)
if err == nil {
return xdgconf
}
}
// Try to create $HOME/.rclone.conf
if homeconf != "" {
return homeconf
}
// Check to see if user supplied a --config variable or environment // Check to see if user supplied a --config variable or environment
// variable. We can't use pflag for this because it isn't initialised // variable. We can't use pflag for this because it isn't initialised
// yet so we search the command line manually. // yet so we search the command line manually.
_, configSupplied := os.LookupEnv("RCLONE_CONFIG") _, configSupplied := os.LookupEnv("RCLONE_CONFIG")
for _, item := range os.Args { if !configSupplied {
if item == "--config" || strings.HasPrefix(item, "--config=") { for _, item := range os.Args {
configSupplied = true if item == "--config" || strings.HasPrefix(item, "--config=") {
break configSupplied = true
break
}
} }
} }
// Default to ./.rclone.conf (current working directory) // If user's configuration directory was found, then try to create it
// and assume rclone.conf can be written there. If user supplied config
// then skip creating the directory since it will not be used.
if cfgpath != "" {
// cfgpath != "" implies cfgdir != ""
if configSupplied {
return cfgpath
}
err := os.MkdirAll(cfgdir, os.ModePerm)
if err == nil {
return cfgpath
}
}
// Assume .rclone.conf can be written to user's home directory.
if homeconf != "" {
return homeconf
}
// Default to ./.rclone.conf (current working directory) if everything else fails.
if !configSupplied { if !configSupplied {
fs.Errorf(nil, "Couldn't find home directory or read HOME or XDG_CONFIG_HOME environment variables.") fs.Errorf(nil, "Couldn't find home directory or read HOME or XDG_CONFIG_HOME environment variables.")
fs.Errorf(nil, "Defaulting to storing config in current directory.") fs.Errorf(nil, "Defaulting to storing config in current directory.")