From 9d1bbcc28882f516010161c9216d6caa9ff84901 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sat, 13 May 2023 15:45:21 +0000 Subject: [PATCH] feat: support changing dotdir --- config/out-of-tree.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/config/out-of-tree.go b/config/out-of-tree.go index f5efe55..ce24808 100644 --- a/config/out-of-tree.go +++ b/config/out-of-tree.go @@ -7,7 +7,6 @@ package config import ( "errors" "os" - "os/user" "time" "github.com/alecthomas/kong" @@ -21,6 +20,9 @@ type DockerCommand struct { } type OutOfTree struct { + // Directory for all files if not explicitly specified + Directory string + Kernels string UserKernels string @@ -77,21 +79,20 @@ func ReadOutOfTreeConf(path string) (c OutOfTree, err error) { err = nil } - usr, err := user.Current() - if err != nil { - return + if c.Directory != "" { + Directory = c.Directory } if c.Kernels == "" { - c.Kernels = usr.HomeDir + "/.out-of-tree/kernels.toml" + c.Kernels = File("kernels.toml") } if c.UserKernels == "" { - c.UserKernels = usr.HomeDir + "/.out-of-tree/kernels.user.toml" + c.Kernels = File("kernels.user.toml") } if c.Database == "" { - c.Database = usr.HomeDir + "/.out-of-tree/db.sqlite" + c.Kernels = File("db.sqlite") } if c.Qemu.Timeout.Duration == 0 {