From fb2e95cde5b0376522bad6a5d54fcc4d021c2dd6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 29 Feb 2016 23:40:23 +0100 Subject: Expand Home --- cmd/acme/config.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 8aad4fa..40bb3c1 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -74,6 +74,17 @@ func DumpTOML(c *Config) (string, error) { } */ +func expandHome(p string) (string, error) { + if strings.HasPrefix(p, "~") { + usr, err := user.Current() + if err != nil { + return p, err + } + return path.Join(usr.HomeDir, p[1:]), nil + } + return p, nil +} + func LoadConfig(fname string) (*Config, error) { conf, err := ioutil.ReadFile(fname) if err != nil { @@ -84,12 +95,9 @@ func LoadConfig(fname string) (*Config, error) { if err != nil { return nil, err } - if strings.HasPrefix(c.BaseDir, "~") { - usr, err := user.Current() - if err != nil { - return nil, err - } - c.BaseDir = path.Join(usr.HomeDir, c.BaseDir[1:]) + c.BaseDir, err = expandHome(c.BaseDir) + if err != nil { + return nil, err } // apply defaults if c.Gracetime == 0 { -- cgit v1.2.3