diff options
author | onefang | 2021-09-04 05:08:11 +1000 |
---|---|---|
committer | onefang | 2021-09-04 05:08:11 +1000 |
commit | ff3cea7d0aedaa2a29337084e5b3cb248627b08a (patch) | |
tree | 3c4321792b91a8cbc3994ca1d86d2c374a5a863c | |
parent | Filter out excess prebuild output. (diff) | |
download | opensim-SC-ff3cea7d0aedaa2a29337084e5b3cb248627b08a.zip opensim-SC-ff3cea7d0aedaa2a29337084e5b3cb248627b08a.tar.gz opensim-SC-ff3cea7d0aedaa2a29337084e5b3cb248627b08a.tar.bz2 opensim-SC-ff3cea7d0aedaa2a29337084e5b3cb248627b08a.tar.xz |
Search ../etc for sledjchisl configuration as well.
Diffstat (limited to '')
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 20 |
1 files changed, 19 insertions, 1 deletions
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 - | |||
8241 | Normally sledjchisl isn't in the path, though it is once our tmux is running. | 8241 | Normally sledjchisl isn't in the path, though it is once our tmux is running. |
8242 | No doubt someone will put it in the path, so then we can start anywhere. | 8242 | No doubt someone will put it in the path, so then we can start anywhere. |
8243 | Someone could run it from a downloaded opensim-SC and run it from that bin, then it's not installed. | 8243 | Someone could run it from a downloaded opensim-SC and run it from that bin, then it's not installed. |
8244 | |||
8245 | During BUILD this all goes haywire. | ||
8246 | BuildIt.sh is run from the downloaded git repo. | ||
8247 | Potentially in a fresh download that doesn't have. ../etc/ | ||
8248 | It's not even checking ../etc/ | ||
8249 | So the default /opt/opensim_SC place to build current_NEW might be wrong. | ||
8250 | Especially if we already had a grid and we are trying to build a new grid. | ||
8251 | /opt/opensim_SC-test/opensim-SC/BuildIt.sh | ||
8252 | builds sledjchisl local | ||
8253 | bin/sledjchisl build -v | ||
8254 | Running in directory /media/DATA/opt/opensim_SC-DG/opensim-SC_Domme | ||
8255 | /etc/sledjChisl.conf.lua | ||
8256 | Which points to the old install at /opt/opensim_SC | ||
8257 | The others don't exist. ../etc/ does though. | ||
8258 | |||
8259 | TODO - test bootstrapping where there is no current install. | ||
8244 | */ | 8260 | */ |
8245 | char *cPaths[] = | 8261 | char *cPaths[] = |
8246 | { | 8262 | { |
@@ -8249,6 +8265,9 @@ Other possibilities - | |||
8249 | "~/.sledjChisl.conf.lua", | 8265 | "~/.sledjChisl.conf.lua", |
8250 | // "~/.config/sledjChisl/*.lua", | 8266 | // "~/.config/sledjChisl/*.lua", |
8251 | "etc/.sledjChisl.conf.lua", | 8267 | "etc/.sledjChisl.conf.lua", |
8268 | "etc/sledjChisl.conf.lua", | ||
8269 | "../etc/.sledjChisl.conf.lua", | ||
8270 | "../etc/sledjChisl.conf.lua", | ||
8252 | ".sledjChisl.conf.lua", | 8271 | ".sledjChisl.conf.lua", |
8253 | NULL | 8272 | NULL |
8254 | }; | 8273 | }; |
@@ -8504,7 +8523,6 @@ Build the OpenSim. | |||
8504 | E("tmux list-sessions command failed! %s", toybuf); | 8523 | E("tmux list-sessions command failed! %s", toybuf); |
8505 | } | 8524 | } |
8506 | 8525 | ||
8507 | |||
8508 | if ((!isWeb) && ((BUILD == currentMode) || (START == currentMode))) | 8526 | if ((!isWeb) && ((BUILD == currentMode) || (START == currentMode))) |
8509 | { | 8527 | { |
8510 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 8528 | //////////////////////////////////////////////////////////////////////////////////////////////////// |