aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2020-01-08 12:31:01 -0500
committerSam Wilkins <samwilkins333@gmail.com>2020-01-08 12:31:01 -0500
commite08598d32fdfdcbd12532facf05b7119bd780a19 (patch)
tree64be2464f6a2970f3cfdab9029de104b5072362c /src
parentd2a544486e9341b90e90640822f13d08c0f3c64b (diff)
solr manager fixes, regex
Diffstat (limited to 'src')
-rw-r--r--src/server/ApiManagers/SearchManager.ts2
-rw-r--r--src/server/DashSession.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts
index c1c908088..cb30c9552 100644
--- a/src/server/ApiManagers/SearchManager.ts
+++ b/src/server/ApiManagers/SearchManager.ts
@@ -73,7 +73,7 @@ export namespace SolrManager {
const args = status ? "start" : "stop -p 8983";
try {
console.log(`Solr management: trying to ${args}`);
- console.log(execSync(`./solr.cmd ${args}`, { cwd: "./solr-8.3.1/bin" }));
+ console.log(execSync(`${process.platform === "win32" ? "solr.cmd" : "solr"} ${args}`, { cwd: "./solr-8.3.1/bin" }).toString());
return true;
} catch (e) {
console.log(red(`Solr management error: unable to ${args}`));
diff --git a/src/server/DashSession.ts b/src/server/DashSession.ts
index 22bcbadc9..83ce7caaf 100644
--- a/src/server/DashSession.ts
+++ b/src/server/DashSession.ts
@@ -49,7 +49,7 @@ export class DashSessionAgent extends Session.AppliedSessionAgent {
}
});
monitor.addReplCommand("pull", [], () => execSync("git pull", { stdio: ["ignore", "inherit", "inherit"] }));
- monitor.addReplCommand("solr", [/start|stop/g], args => SolrManager.SetRunning(args[0] === "start"));
+ monitor.addReplCommand("solr", [/start|stop/], args => SolrManager.SetRunning(args[0] === "start"));
return monitor;
}