docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump version, fix exec related error in new version 

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
This commit is contained in:
Jeffrey Morgan 2015-12-07 14:54:38 -08:00
parent b162d6bd51
commit 31928e6914
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -20,7 +20,7 @@
"lint": "jsxhint src" "lint": "jsxhint src"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"electron-version": "0.33.9", "electron-version": "0.35.4",
"dependencies": { "dependencies": {
"JSONStream": "^1.0.7", "JSONStream": "^1.0.7",
"alt": "^0.16.2", "alt": "^0.16.2",
@ -33,7 +33,6 @@
"coveralls": "^2.11.2", "coveralls": "^2.11.2",
"deep-extend": "^0.4.0", "deep-extend": "^0.4.0",
"dockerode": "^2.2.3", "dockerode": "^2.2.3",
"exec": "0.2.1",
"install": "^0.1.8", "install": "^0.1.8",
"jquery": "^2.1.3", "jquery": "^2.1.3",
"mixpanel": "kitematic/mixpanel-node", "mixpanel": "kitematic/mixpanel-node",
@ -56,7 +55,7 @@
"devDependencies": { "devDependencies": {
"babel": "^5.8.23", "babel": "^5.8.23",
"babel-jest": "^5.2.0", "babel-jest": "^5.2.0",
"electron-prebuilt": "^0.33.9", "electron-prebuilt": "^0.35.4",
"eslint": "^1.3.1", "eslint": "^1.3.1",
"eslint-plugin-react": "^3.3.0", "eslint-plugin-react": "^3.3.0",
"grunt": "^0.4.5", "grunt": "^0.4.5",

8
src/utils/Util.js
View File

@ -1,4 +1,3 @@
import exec from 'exec';
import child_process from 'child_process'; import child_process from 'child_process';
import Promise from 'bluebird'; import Promise from 'bluebird';
import fs from 'fs'; import fs from 'fs';
@ -20,12 +19,11 @@ module.exports = {
} }
} }
let fn = Array.isArray(args) ? exec : child_process.exec;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fn(args, options, (stderr, stdout, code) => {
if (code) {
var cmd = Array.isArray(args) ? args.join(' ') : args; var cmd = Array.isArray(args) ? args.join(' ') : args;
reject(new Error(cmd + ' returned non zero exit code. Stderr: ' + stderr)); child_process.exec(cmd, options, (error, stdout, stderr) => {
if (error) {
reject(new Error('Encountered an error: ' + error));
} else { } else {
resolve(stdout); resolve(stdout);
} }