Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into renovate/yargs-16.x
- Loading branch information
Showing
10 changed files
with
163 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,18 @@ | ||
| const exec = require('child_process').exec | ||
| const { promisify } = require('util') | ||
| const printError = require('./print-error') | ||
|
|
||
| module.exports = function (args, cmd) { | ||
| if (args.dryRun) return Promise.resolve() | ||
| return new Promise((resolve, reject) => { | ||
| // Exec given cmd and handle possible errors | ||
| exec(cmd, function (err, stdout, stderr) { | ||
| // If exec returns content in stderr, but no error, print it as a warning | ||
| // If exec returns an error, print it and exit with return code 1 | ||
| if (err) { | ||
| printError(args, stderr || err.message) | ||
| return reject(err) | ||
| } else if (stderr) { | ||
| printError(args, stderr, { level: 'warn', color: 'yellow' }) | ||
| } | ||
| return resolve(stdout) | ||
| }) | ||
| }) | ||
| const exec = promisify(require('child_process').exec) | ||
|
|
||
| module.exports = async function (args, cmd) { | ||
| if (args.dryRun) return | ||
| try { | ||
| const { stderr, stdout } = await exec(cmd) | ||
| // If exec returns content in stderr, but no error, print it as a warning | ||
| if (stderr) printError(args, stderr, { level: 'warn', color: 'yellow' }) | ||
| return stdout | ||
| } catch (error) { | ||
| // If exec returns an error, print it and exit with return code 1 | ||
| printError(args, error.stderr || error.message) | ||
| throw error | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,18 @@ | ||
| const { execFile } = require('child_process') | ||
| const { promisify } = require('util') | ||
| const printError = require('./print-error') | ||
|
|
||
| module.exports = function (args, cmd, cmdArgs) { | ||
| if (args.dryRun) return Promise.resolve() | ||
| return new Promise((resolve, reject) => { | ||
| // Exec given cmd and handle possible errors | ||
| execFile(cmd, cmdArgs, function (err, stdout, stderr) { | ||
| // If exec returns content in stderr, but no error, print it as a warning | ||
| // If exec returns an error, print it and exit with return code 1 | ||
| if (err) { | ||
| printError(args, stderr || err.message) | ||
| return reject(err) | ||
| } else if (stderr) { | ||
| printError(args, stderr, { level: 'warn', color: 'yellow' }) | ||
| } | ||
| return resolve(stdout) | ||
| }) | ||
| }) | ||
| const execFile = promisify(require('child_process').execFile) | ||
|
|
||
| module.exports = async function (args, cmd, cmdArgs) { | ||
| if (args.dryRun) return | ||
| try { | ||
| const { stderr, stdout } = await execFile(cmd, cmdArgs) | ||
| // If execFile returns content in stderr, but no error, print it as a warning | ||
| if (stderr) printError(args, stderr, { level: 'warn', color: 'yellow' }) | ||
| return stdout | ||
| } catch (error) { | ||
| // If execFile returns an error, print it and exit with return code 1 | ||
| printError(args, error.stderr || error.message) | ||
| throw error | ||
| } | ||
| } |
Oops, something went wrong.