aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/sledjchisl/sledjchisl.c
diff options
context:
space:
mode:
authoronefang2021-08-03 14:09:04 +1000
committeronefang2021-08-03 14:09:04 +1000
commit586b9c757d85fdf7d56f1b1312bbfcbe71fb36da (patch)
treea9e1659a57e4e63c3acb16674832d8987a47e50d /src/sledjchisl/sledjchisl.c
parentFree the paneID. (diff)
downloadopensim-SC-586b9c757d85fdf7d56f1b1312bbfcbe71fb36da.zip
opensim-SC-586b9c757d85fdf7d56f1b1312bbfcbe71fb36da.tar.gz
opensim-SC-586b9c757d85fdf7d56f1b1312bbfcbe71fb36da.tar.bz2
opensim-SC-586b9c757d85fdf7d56f1b1312bbfcbe71fb36da.tar.xz
Run everything in current/bin
Coz OpenSim.
Diffstat (limited to 'src/sledjchisl/sledjchisl.c')
-rw-r--r--src/sledjchisl/sledjchisl.c11
1 files changed, 5 insertions, 6 deletions
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.
7179 I("Not running inside the proper tmux server, starting it."); 7179 I("Not running inside the proper tmux server, starting it.");
7180 snprintf(toybuf, sizeof(toybuf), 7180 snprintf(toybuf, sizeof(toybuf),
7181 "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:' " 7181 "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:' "
7182 "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s; bash'", 7182 "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s/current/bin; bash'",
7183 scBin, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scBin, scRoot); 7183 scBin, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scBin, scRoot);
7184 } 7184 }
7185 else 7185 else
@@ -7189,7 +7189,7 @@ jit library is loaded or the JIT compiler will not be activated.
7189 // 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. 7189 // 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.
7190 snprintf(toybuf, sizeof(toybuf), 7190 snprintf(toybuf, sizeof(toybuf),
7191 "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:' " 7191 "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:' "
7192 "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s; bash'", 7192 "bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s/current/bin; bash'",
7193 scUser, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scRoot); 7193 scUser, Tcmd, scRun, Tsocket, Tconsole, Ttab, scBin, Tconsole, scBin, scRoot);
7194 } 7194 }
7195 i = system(toybuf); 7195 i = system(toybuf);
@@ -8233,11 +8233,10 @@ Also clear out tmp when doing a full stop.
8233 // Start up the web stuff. TODO - remove this once we handle the fcgi stuff ourselves. 8233 // Start up the web stuff. TODO - remove this once we handle the fcgi stuff ourselves.
8234 I("Starting the web stuff."); 8234 I("Starting the web stuff.");
8235 char *d = xmprintf("%s.{bottom}", Ttab); 8235 char *d = xmprintf("%s.{bottom}", Ttab);
8236// TODO - not sure why this needs to start in current/src. 8236 char *c = xmprintf(
8237 char *c = xmprintf("cd %s/current/src; "
8238 "spawn-fcgi -n -u %s -s %s/sledjchisl.socket -M 0660 -G www-data -- " 8237 "spawn-fcgi -n -u %s -s %s/sledjchisl.socket -M 0660 -G www-data -- "
8239 "/usr/bin/valgrind --leak-check=full sledjchisl; cd %s; bash", 8238 "/usr/bin/valgrind --leak-check=full sledjchisl",
8240 scRoot, scUser, scCache, scRoot); 8239 scUser, scCache, scRoot);
8241 sendTmuxCmd(d, c); 8240 sendTmuxCmd(d, c);
8242 free(c); 8241 free(c);
8243 free(d); 8242 free(d);