Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices
commit
0420f5dd87
|
@ -32,15 +32,25 @@ export default class Util {
|
|||
* @param options childProcess.ExecOptions
|
||||
*/
|
||||
public async exec(command: string, options: childProcess.ExecOptions = {}): Promise<string> {
|
||||
const ex = promisify(childProcess.exec);
|
||||
let result: string;
|
||||
try {
|
||||
const res = await ex(command, options);
|
||||
result = `${res.stdout}${res.stderr}`;
|
||||
} catch (err) {
|
||||
return Promise.reject(new Error(`Command failed: ${err.cmd}\n${err.stderr}${err.stdout}`));
|
||||
}
|
||||
return result;
|
||||
return new Promise((res, rej) => {
|
||||
let error = false;
|
||||
let output = '';
|
||||
const writeFunction = (data: string|Buffer|Error) => {
|
||||
if (data instanceof Error) error = true;
|
||||
output += `${data}`;
|
||||
};
|
||||
const cmd = childProcess.exec(command, options);
|
||||
cmd.stdout.on('data', writeFunction);
|
||||
cmd.stderr.on('data', writeFunction);
|
||||
cmd.on('error', writeFunction);
|
||||
cmd.once('close', (code, signal) => {
|
||||
cmd.stdout.removeListener('data', writeFunction);
|
||||
cmd.stderr.removeListener('data', writeFunction);
|
||||
cmd.removeListener('error', writeFunction);
|
||||
if (error) rej(output);
|
||||
res(output);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue