From a138681e1d5f9caec2983254c12243d5f79d9876 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sat, 17 Nov 2018 13:44:03 +0000 Subject: [PATCH] Set default kernels config path to dotfiles --- main.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 80abb20..e3c8b60 100644 --- a/main.go +++ b/main.go @@ -12,6 +12,7 @@ import ( "math/rand" "os" "os/exec" + "os/user" "regexp" "runtime" "strings" @@ -501,8 +502,15 @@ func main() { pathFlag := app.Flag("path", "Path to work directory") path := pathFlag.Default(".").ExistingDir() + usr, err := user.Current() + if err != nil { + return + } + defaultKcfgPath := usr.HomeDir + "/.out-of-tree/kernels.toml" + kcfgPathFlag := app.Flag("kernels", "Path to kernels config") - kcfgPath := kcfgPathFlag.Envar("OUT_OF_TREE_KCFG").Required().ExistingFile() + kcfgPathEnv := kcfgPathFlag.Envar("OUT_OF_TREE_KCFG") + kcfgPath := kcfgPathEnv.Default(defaultKcfgPath).ExistingFile() qemuTimeoutFlag := app.Flag("qemu-timeout", "Timeout for qemu") qemuTimeout := qemuTimeoutFlag.Default("1m").Duration() @@ -526,6 +534,8 @@ func main() { kernelCommand := app.Command("kernel", "Manipulate kernels") kernelListCommand := kernelCommand.Command("list", "List kernels") + kingpin.MustParse(app.Parse(os.Args[1:])) + kcfg, err := readKernelConfig(*kcfgPath) if err != nil { log.Fatalln(err)