From 586b9c757d85fdf7d56f1b1312bbfcbe71fb36da Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 3 Aug 2021 14:09:04 +1000
Subject: Run everything in current/bin

Coz OpenSim.
---
 src/sledjchisl/sledjchisl.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index dd30407..d2589c8 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -7179,7 +7179,7 @@ jit library is loaded or the JIT compiler will not be activated.
 	    I("Not running inside the proper tmux server, starting it.");
 	    snprintf(toybuf, sizeof(toybuf), 
 	      "export PATH='%s:$PATH'; %s %s/%s new-session -d -s %s  -n '%s' bash -c 'export PATH=%s:$PATH; bash' \\; split-window -vp 50 -t '%s:' "
-	      "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s; bash'",
+	      "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s/current/bin; bash'",
 	      scBin, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scBin, scRoot);
 	}
 	else
@@ -7189,7 +7189,7 @@ jit library is loaded or the JIT compiler will not be activated.
 	    // After the session is created, we rely on the scRun directory to be group sticky, so that anyone in the opensim group can attach to the tmux socket.
 	    snprintf(toybuf, sizeof(toybuf),
 	      "sudo -Hu %s %s %s/%s new-session -d -s %s -n '%s' bash -c 'export PATH=%s:$PATH; bash' \\; split-window -vp 50 -t '%s:' "
-	      "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s; bash'",
+	      "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s/current/bin; bash'",
 	      scUser, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scRoot);
 	}
 	i = system(toybuf);
@@ -8233,11 +8233,10 @@ Also clear out tmp when doing a full stop.
       // Start up the web stuff.  TODO - remove this once we handle the fcgi stuff ourselves.
       I("Starting the web stuff.");
       char *d = xmprintf("%s.{bottom}", Ttab);
-// TODO - not sure why this needs to start in current/src.
-      char *c = xmprintf("cd %s/current/src; "
+      char *c = xmprintf(
         "spawn-fcgi -n -u %s -s %s/sledjchisl.socket -M 0660 -G www-data  -- "
-        "/usr/bin/valgrind --leak-check=full sledjchisl; cd %s; bash",
-        scRoot, scUser, scCache, scRoot);
+        "/usr/bin/valgrind --leak-check=full sledjchisl",
+        scUser, scCache, scRoot);
       sendTmuxCmd(d, c);
       free(c);
       free(d);
-- 
cgit v1.1