script output coming back clceanly

5 files changed, 19 insertions, 11 deletions

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index 5bf8a37..8338c82 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -13,13 +13,15 @@ export const load_directories = () => (dispatch) => {
     actions.task.index({ module: 'samplernn' }),
     actions.socket.list_directory({ module: 'samplernn', dir: 'results' }),
     actions.socket.list_directory({ module: 'samplernn', dir: 'datasets' }),
+    actions.socket.run_script({ module: 'samplernn', activity: 'report' })
   ]).then(res => {
     console.log(res)
-    const [folders, files, results, datasets] = res
-    console.log(folders.length, files.length, results.length, datasets.length)
+    const [folders, files, tasks, results, datasets, report] = res
+    console.log(folders.length, files.length, tasks.length, results.length, datasets.length)
+    console.log(report)
     dispatch({
       type: types.samplernn.init,
-      data: { folders, files, results, datasets },
+      data: { folders, files, results, datasets, report },
     })
   })
 }
diff --git a/app/client/socket/socket.actions.js b/app/client/socket/socket.actions.js
index a2162ac..b1f13ef 100644
--- a/app/client/socket/socket.actions.js
+++ b/app/client/socket/socket.actions.js
@@ -1,7 +1,9 @@
 import {
   list_directory_async,
-  run_system_command_async
+  run_system_command_async,
+  run_script_async,
 } from './socket.system'
 
 export const list_directory = list_directory_async
-export const run_system_command = run_system_command_async
\ No newline at end of file
+export const run_system_command = run_system_command_async
+export const run_script = run_script_async
\ No newline at end of file
diff --git a/app/client/socket/socket.system.js b/app/client/socket/socket.system.js
index ad9e8ac..5c1e294 100644
--- a/app/client/socket/socket.system.js
+++ b/app/client/socket/socket.system.js
@@ -58,13 +58,15 @@ export function list_directory(opt) {
   })
 }
 
+export function run_system_command_async(opt) {
+  return syscall_async('run_system_command', opt)
+}
 export function list_directory_async(opt) {
   return syscall_async('list_directory', opt).then(res => res.files)
 }
-export function run_system_command_async(opt) {
-  return syscall_async('run_system_command', opt)
+export function run_script_async(opt) {
+  return syscall_async('run_script', opt)
 }
-
 export const syscall_async = (tag, payload, ttl=10000) => {
   return new Promise( (resolve, reject) => {
     const uuid = uuidv1()
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){