tiro-notes 0.27.47 → 0.27.48

package/cli.js

@@ -76,19 +76,21 @@ function startTiroServer (argsObj, cb) {
 		console.log(`Starting Tiro-Notes from CLI with following arguments : ${JSON.stringify(argsObj)}`);
 
 		// kill all possible remaining servers of tiro 
-		tHelpers.killPreviousInstances();
-
-		// start tiro server, detect success message and get server params
-		tHelpers.execCmd('node', [`${__dirname}/server/tiro-server.js`], {
-				env: {
-						TIRO_PORT: argsObj.port,
-						TIRO_HTTPS: argsObj.https
-				},  
-				logName: 'tiroServer',
-				onLog: str => {
-						tHelpers.checkAndGetTiroConfig(str, {platform: 'cli', cb})
-				}
-		})
+		tHelpers.killPreviousInstances(() => {
+
+				// start tiro server, detect success message and get server params
+				tHelpers.execCmd('node', [`${__dirname}/server/tiro-server.js`], {
+						env: {
+								TIRO_PORT: argsObj.port,
+								TIRO_HTTPS: argsObj.https
+						},  
+						logName: 'tiroServer',
+						onLog: str => {
+								tHelpers.checkAndGetTiroConfig(str, {platform: 'cli', cb})
+						}
+				})
+
+		});
 }
 
 const startSshTunnel = (argsObj) => {

package/package.json

@@ -1,6 +1,6 @@
 {																 
 		"name": "tiro-notes",
-		"version": "0.27.47",
+		"version": "0.27.48",
 		"description": "Tiro Notes CLI to start Tiro Notes from the command line!",
 		"scripts": {
 				"dev": "ISDEV=true node cli.js",

package/shared.helpers.build.js

@@ -69,10 +69,25 @@ const execCmd = (cmd, params, p) => {
 		return child;
 }
 
-const killPreviousInstances = () => {
-		execCmd('sh', ['-c', 'kill $(ps aux | grep tiro-server.js | awk \'{print $2}\' )'], { 
-				logName: 'Kill prev tiroServer',
-		})
+const killPreviousInstances = (cb) => {
+		if (!cb) cb = () => {}
+
+		// LINUX / MAC => unix like
+		const isWin = process.platform.startsWith('win');
+
+		if (isWin) {
+				cb()
+		} else {
+				let cb1 = true;
+				execCmd('sh', ['-c', 'kill $(ps aux | grep tiro-server.js | awk \'{print $2}\' )'], { 
+						logName: 'Kill prev tiroServer',
+						onLog: () => {
+								if (!cb1) return
+								cb1 = false;
+								cb()
+						}
+				})
+		}
 }
 
 const e = {