push.rocks/smartshell
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve silent options

Browse Source
This commit is contained in:
Philipp Kunz
2017-06-27 11:18:37 +02:00
parent bc2d0dda3f
commit ca175205ee
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ts/smartshell.wrap.ts
View File

@ -53,9 +53,9 @@ export let execSilent = (commandStringArg: string) => {
/**
* executes a command and allws you to stream output
*/
export let execStreaming = (commandStringArg: string) => {
export let execStreaming = (commandStringArg: string, silentArg: boolean = false) => {
let childProcessEnded = plugins.smartq.defer<IExecResult>()
let execChildProcess = plugins.shelljs.exec(commandStringArg, {async: true, silent: true}, (code, stdout, stderr) => {
let execChildProcess = plugins.shelljs.exec(commandStringArg, {async: true, silent: silentArg}, (code, stdout, stderr) => {
childProcessEnded.resolve({
exitCode: code,
stdout: stdout
@ -67,14 +67,18 @@ export let execStreaming = (commandStringArg: string) => {
}
}
export let execStreamingSilent = (commandStringArg: string) => {
return execStreaming(commandStringArg, true)
}
/**
* executes a command and returns promise that will be fullfilled once an putput line matches RegexArg
* @param commandStringArg
* @param regexArg
*/
export let execAndWaitForLine = (commandStringArg: string, regexArg: RegExp) => {
export let execAndWaitForLine = (commandStringArg: string, regexArg: RegExp, silentArg: boolean = false) => {
let done = plugins.smartq.defer()
let execStreamingResult = execStreaming(commandStringArg)
let execStreamingResult = execStreaming(commandStringArg, silentArg)
execStreamingResult.childProcess.stdout.on('data', (stdOutChunk: string) => {
if (regexArg.test(stdOutChunk)) {
done.resolve()
@ -83,6 +87,10 @@ export let execAndWaitForLine = (commandStringArg: string, regexArg: RegExp) =>
return done.promise
}
export let execAndWaitForLineSilent = (commandStringArg: string, regexArg: RegExp) => {
execAndWaitForLine(commandStringArg, regexArg, true)
}
/**
* get a path
*/