From a1296a665c9509a22fb07ec592c8c39d3aa06265 Mon Sep 17 00:00:00 2001
From: Skander Hatira <skander.hatira@inrae.fr>
Date: Thu, 17 Mar 2022 16:14:17 +0100
Subject: [PATCH] code cleanup plus path fix
---
src/backend/spawnMongod.js | 11 +++++++----
src/main.js | 14 +++++++-------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/backend/spawnMongod.js b/src/backend/spawnMongod.js
index 026620e..007b7fe 100644
--- a/src/backend/spawnMongod.js
+++ b/src/backend/spawnMongod.js
@@ -8,11 +8,14 @@ const spawnChild = async (unixSocket) => {
".biseps",
"biseps.json"
));
- console.log("HAHAHAHAHAHAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa");
- console.log(bisepsConfig.database);
- const logfile = path.join(homedir, "mongoWindow.txt");
+ const logfile = path.join(homedir, ".biseps", "mongodb.out.txt");
const output = fs.openSync(logfile, "a");
- const command = process.platform == "win32" ? "conda" : "conda";
+ const command =
+ process.platform == "win32"
+ ? "conda"
+ : bisepsConfig.conda === ""
+ ? "conda"
+ : bisepsConfig.conda;
// : `$(head -n 1 $HOME/.conda/environments.txt)/bin/conda`;
const options = {
diff --git a/src/main.js b/src/main.js
index 178e33e..1b30ab4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@ const {
session,
ipcRenderer,
} = require("electron");
+
const uid = uuidv4();
const mongod = require("./backend/spawnMongod.js");
const os = require("os");
@@ -58,14 +59,13 @@ exec(
conda: false,
prop1: sock,
});
- } else {
- console.log(`stdout: ${stdout}`);
- return (global.sharedObj = {
- platform: process.platform,
- conda: true,
- prop1: sock,
- });
}
+ console.log(`stdout: ${stdout}`);
+ return (global.sharedObj = {
+ platform: process.platform,
+ conda: true,
+ prop1: sock,
+ });
}
);
execSync(
--
GitLab