summaryrefslogtreecommitdiff
path: root/app/relay
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-01 04:48:34 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-01 04:48:34 +0200
commiteba0237384836a66a2895e44636739bc47a5943a (patch)
tree412549f8a31d9ad4ceb5498a125e6da52e1f3f4c /app/relay
parent3824c7b35dfa6ef74d396c54306afbbb6d557fe0 (diff)
script output coming back clceanly
Diffstat (limited to 'app/relay')
-rw-r--r--app/relay/remote.js2
-rw-r--r--app/relay/runner.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/app/relay/remote.js b/app/relay/remote.js
index 60c0b06..4da9200 100644
--- a/app/relay/remote.js
+++ b/app/relay/remote.js
@@ -105,7 +105,7 @@ remote.on('system', (data) => {
})
break
case 'run_script':
- runner.run_script(data.payload, (files) => {
+ runner.run_script(data.payload, (error, stdout, stderr) => {
remote.emit('system_res', {
type: 'run_script',
cmd: data.payload,
diff --git a/app/relay/runner.js b/app/relay/runner.js
index 63cae69..b0b9d43 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -71,7 +71,7 @@ export function build_params(module, task) {
opt_params = activity.params(task)
}
else {
- const opt = task.opt
+ const opt = task.opt || {}
opt_params = Object.keys(opt).map(key => {
const flag = '--' + key.replace(/-/g, '_')
const value = opt[key]
@@ -149,7 +149,9 @@ export function run_script(task, cb) {
console.log('running task', task.activity)
console.log(module.cwd)
console.log(interpreter.cmd, params)
- execFile(interpreter.cmd, [params], cb)
+ execFile(interpreter.cmd, params, {
+ cwd: module.cwd,
+ }, cb)
}
export function run_task(task, preempt, watch){