From b1b5e32525cb106b03d65e7c3011a1fd4aaa82c7 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Thu, 28 Jun 2018 00:44:41 -0600 Subject: [PATCH] correctly pass error on failure to launch --- usr/share/install-launcher.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/share/install-launcher.js b/usr/share/install-launcher.js index 8c7fdaf..7d1c343 100644 --- a/usr/share/install-launcher.js +++ b/usr/share/install-launcher.js @@ -72,7 +72,6 @@ Launcher.install = function (things, fn) { var stdout = fs.openSync(path.join(logpath, 'info.log'), 'a'); var stderr = fs.openSync(path.join(logpath, 'error.log'), 'a'); - var killed = 0; var err; var subprocess = spawn( vars.telebitNode @@ -88,15 +87,16 @@ Launcher.install = function (things, fn) { subprocess.unref(); subprocess.on('error', function (_err) { err = _err; - killed += 1; }); subprocess.on('exit', function (code, signal) { if (!err) { err = new Error('' + code + ' ' + signal + ' failure to launch'); } - killed += 1; }); setTimeout(function () { - if (fn) { fn(null); return; } + if (fn) { + fn(err); + return; + } }, 1 * 1000); return; }