From aff7b69cab2ac1d09b47f28c6fa653febd8595ea Mon Sep 17 00:00:00 2001
From: Flu0r1ne <flur01ne@flu0r1ne.net>
Date: Fri, 3 Sep 2021 18:12:38 -0500
Subject: Ensure stddirs returns an absolute path for correct operation in
 adapter build directories

---
 stddirs.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'stddirs.go')

diff --git a/stddirs.go b/stddirs.go
index e6b510d..1eae439 100644
--- a/stddirs.go
+++ b/stddirs.go
@@ -109,7 +109,7 @@ func (c DirConfig) Config() string {
   }
 
   if dir := dirFromEnv("config", ENV_CONFIG_DIR); dir != nil {
-    c.config = *dir
+    c.config = abs(*dir)
     return c.config
   }
 
@@ -117,7 +117,7 @@ func (c DirConfig) Config() string {
     log.Fatal("Could not find planr directory");
   }
 
-  c.config = c.pdFallback;
+  c.config = abs(c.pdFallback);
   return c.config
 }
 
@@ -136,6 +136,16 @@ func (c DirConfig) Src() string {
   return path.Join(dir, DEFAULT_PATH_SRC)
 }
 
+func abs(path string) string {
+  apath, err := filepath.Abs(path)
+
+  if err != nil {
+    log.Fatalf("Could not find path %s", path)
+  }
+
+  return apath
+}
+
 func (c DirConfig) Build() string {
   if c.src != "" {
     return c.src
@@ -168,13 +178,13 @@ func (c DirConfig) MkBuild() {
 }
 
 func (c DirConfig) Rubric() string {
-  rubric := path.Join(c.Config(), "rubric")
+  rubric := path.Join(c.Config(), DEFAULT_PATH_RUBRIC)
   dieDirAbsent("rubric", rubric)
   return rubric
 }
 
 func (c DirConfig) Tests() string {
-  tests := path.Join(c.Config(), "tests")
+  tests := path.Join(c.Config(), DEFAULT_PATH_TESTS)
   dieDirAbsent("tests", tests)
   return tests
 }
-- 
cgit v1.2.3