From ff3cea7d0aedaa2a29337084e5b3cb248627b08a Mon Sep 17 00:00:00 2001
From: onefang
Date: Sat, 4 Sep 2021 05:08:11 +1000
Subject: Search ../etc for sledjchisl configuration as well.

---
 src/sledjchisl/sledjchisl.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 81268c3..aa40936 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -8241,6 +8241,22 @@ Other possibilities -
     Normally sledjchisl isn't in the path, though it is once our tmux is running.
     No doubt someone will put it in the path, so then we can start anywhere.
     Someone could run it from a downloaded opensim-SC and run it from that bin, then it's not installed.
+
+During BUILD this all goes haywire.
+  BuildIt.sh is run from the downloaded git repo.
+  Potentially in a fresh download that doesn't have. ../etc/
+    It's not even checking ../etc/
+  So the default /opt/opensim_SC place to build current_NEW might be wrong.
+  Especially if we already had a grid and we are trying to build a new grid.
+    /opt/opensim_SC-test/opensim-SC/BuildIt.sh
+	builds sledjchisl local
+	bin/sledjchisl build -v
+	  Running in directory /media/DATA/opt/opensim_SC-DG/opensim-SC_Domme
+	  /etc/sledjChisl.conf.lua
+	    Which points to the old install at /opt/opensim_SC
+	  The others don't exist.  ../etc/ does though.
+
+TODO - test bootstrapping where there is no current install.
 */
   char *cPaths[] =
   {
@@ -8249,6 +8265,9 @@ Other possibilities -
     "~/.sledjChisl.conf.lua",
 //    "~/.config/sledjChisl/*.lua",
     "etc/.sledjChisl.conf.lua",
+    "etc/sledjChisl.conf.lua",
+    "../etc/.sledjChisl.conf.lua",
+    "../etc/sledjChisl.conf.lua",
     ".sledjChisl.conf.lua",
     NULL
   };
@@ -8504,7 +8523,6 @@ Build the OpenSim.
       E("tmux list-sessions command failed!  %s", toybuf);
   }
 
-
   if ((!isWeb) && ((BUILD == currentMode) || (START == currentMode)))
   {
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.1