From 27fbc380cbe26063c5e16cfc6423de262cf7f473 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Mon, 14 Jun 2021 23:16:48 +0200 Subject: [PATCH] Check if trimspNL found. --- TrimSPelec.js | 12 +++++++++++- TrimSPlib.js | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/TrimSPelec.js b/TrimSPelec.js index 3aef0be..e19e46c 100644 --- a/TrimSPelec.js +++ b/TrimSPelec.js @@ -17,7 +17,7 @@ function execute(command) { } function checkDir(directory) { - // Check whether director exists, if not create it + // Check whether directory exists, if not create it if (!fs.existsSync(directory)) { // Folder does not exist try to create it fs.mkdir(directory,{recursive: true}, (err) => { @@ -54,3 +54,13 @@ function readAsciiFile(filename) { return(content); } +function fileExists(filename) { + try { + if (fs.existsSync(filename)) { + return 1; + } + }catch(err) { + console.log(err); + } + return 0; +} diff --git a/TrimSPlib.js b/TrimSPlib.js index 02f69e3..c46fff0 100644 --- a/TrimSPlib.js +++ b/TrimSPlib.js @@ -934,7 +934,12 @@ function sum(array){ function startSequence(All) { let cmd = ''; let trimBin = All['trimPath']+"/trimspNL"; - + // Check if the trimspNL binary is found + if (!fileExists(trimBin)) { + // if not found, try in PATH and hope for the best + trimBin = "trimspNL"; + } + // Check if workPath exists otherwise create it checkDir(All['workPath']); // from TrimSPelec.js, Electron/Node specific @@ -1044,7 +1049,6 @@ function startSequence(All) { writeAsciiFile(FILENAME+".inp", eingabe1); Progress=20; // Update progress on GUI - let path = process.env.PWD; cmd = "cd "+All["workPath"]+";cp "+FILENAME+".inp eingabe1.inp;"+trimBin; execute(cmd); // document.getElementById("myBar").style.width = Progress + "%";