From a915f2e3422972f80ce509e04f604dbc1bdc191c Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 26 Apr 2022 13:17:35 +0200 Subject: [PATCH] construct OCIS_BASE_DATA_PATH and OCIS_CONFIG_DIR from one base path --- docs/helpers/configenvextractor.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/helpers/configenvextractor.go b/docs/helpers/configenvextractor.go index 3f08ca0cec..d7afd52955 100644 --- a/docs/helpers/configenvextractor.go +++ b/docs/helpers/configenvextractor.go @@ -56,8 +56,9 @@ func GenerateIntermediateCode(templatePath string, intermediateCodePath string, func RunIntermediateCode(intermediateCodePath string) { fmt.Println("Running intermediate go code for " + intermediateCodePath) - os.Setenv("OCIS_BASE_DATA_PATH", "~/.ocis") - os.Setenv("OCIS_CONFIG_DIR", "~/.ocis/config") + defaultPath := "~/.ocis" + os.Setenv("OCIS_BASE_DATA_PATH", defaultPath) + os.Setenv("OCIS_CONFIG_DIR", path.Join(defaultPath, "config")) out, err := exec.Command("go", "run", intermediateCodePath).Output() if err != nil { log.Fatal(err)