Commit a789fa7f authored by yann300's avatar yann300

git return value insead of logging

parent 5c58b489
......@@ -104,12 +104,6 @@ class Terminal extends Plugin {
this.on('scriptRunner', 'error', (msg) => {
this.commands.error.apply(this.commands, msg.data)
})
this.on('git', 'log', (result) => {
this.commands.html(yo`<pre>${result}</pre>`)
})
this.on('git', 'error', (result) => {
this.commands.html(yo`<pre>${result}</pre>`)
})
}
onDeactivation () {
......@@ -117,8 +111,6 @@ class Terminal extends Plugin {
this.off('scriptRunner', 'info')
this.off('scriptRunner', 'warn')
this.off('scriptRunner', 'error')
this.off('git', 'log')
this.off('git', 'error')
}
logHtml (html) {
......@@ -755,11 +747,13 @@ class Terminal extends Plugin {
}
}
try {
let result
if (script.trim().startsWith('git')) {
await this.call('git', 'execute', script)
result = await this.call('git', 'execute', script)
} else {
await this.call('scriptRunner', 'execute', script)
result = await this.call('scriptRunner', 'execute', script)
}
if (result) self.commands.html(yo`<pre>${result}</pre>`)
done()
} catch (error) {
done(error.message || error)
......
......@@ -23,6 +23,7 @@ export class GitClient extends PluginClient {
const child = spawn(cmd, options)
let result = ''
let error = ''
return new Promise((resolve, reject) => {
child.stdout.on('data', (data) => {
result += data.toString()
})
......@@ -30,8 +31,9 @@ export class GitClient extends PluginClient {
error += err.toString()
})
child.on('close', () => {
if (error !== '') this.emit('error', error)
else this.emit('log', result)
if (error) reject(error)
else resolve(result)
})
})
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment