From d25e0272018a234ef506cf7a23062898c0150f5f Mon Sep 17 00:00:00 2001 From: johanneskropf <46578064+johanneskropf@users.noreply.github.com> Date: Fri, 12 Jun 2020 17:10:31 +0200 Subject: [PATCH] moved building of execOpt object to line 36 --- .../node_modules/@node-red/nodes/core/function/90-exec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js index 795343c22..a1e51e7f1 100644 --- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js +++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js @@ -33,7 +33,10 @@ module.exports = function(RED) { this.oldrc = (n.oldrc || false).toString(); var node = this; - var cleanup = function(p) { + var execOpt = {encoding:'binary', maxBuffer:10000000}; + if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { execOpt.shell = '/bin/bash'; } + + var cleanup = function(p) { node.activeProcesses[p].kill(); //node.status({fill:"red",shape:"dot",text:"timeout"}); //node.error("Exec node timeout"); @@ -123,8 +126,6 @@ module.exports = function(RED) { }); } else { - var execOpt = {encoding:'binary', maxBuffer:10000000}; - if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { execOpt.shell = '/bin/bash'; } var cl = node.cmd; if ((node.addpay === true) && msg.hasOwnProperty("payload")) { cl += " "+msg.payload; } if (node.append.trim() !== "") { cl += " "+node.append; }