Commit 44053a1
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -71,11 +71,11 @@ function checkAndBuild() { | |||
| 71 | 71 | } | |
| 72 | 72 | }) | |
| 73 | 73 | .then(function() { | |
| 74 | - return build(nwVersion); | ||
| 74 | + return build(); | ||
| 75 | 75 | }); | |
| 76 | 76 | } | |
| 77 | 77 | ||
| 78 | - function build(nwVersion) { | ||
| 78 | + function build() { | ||
| 79 | 79 | console.info("[nodegit] Everything is ready to go, attempting compilation"); | |
| 80 | 80 | if (nwVersion) { | |
| 81 | 81 | console.info("[nodegit] Building native node-webkit module."); | |
@@ -93,24 +93,25 @@ function build(nwVersion) { | |||
| 93 | 93 | var target = ""; | |
| 94 | 94 | var debug = (process.env.BUILD_DEBUG ? " --debug" : ""); | |
| 95 | 95 | var builder = "node-gyp"; | |
| 96 | - var dist-url = ""; | ||
| 96 | + var distUrl = ""; | ||
| 97 | 97 | ||
| 98 | 98 | if (asVersion) { | |
| 99 | - prefix = process.platform == 'win32' | ||
| 100 | - ? 'SET HOME="~/.atom-shell-gyp" &&s' | ||
| 101 | - : 'HOME=~/.atom-shell-gyp'; | ||
| 99 | + prefix = (process.platform == "win32" | ||
| 100 | + ? "SET HOME=\"~/.atom-shell-gyp\" && " | ||
| 101 | + : "HOME=~/.atom-shell-gyp"); | ||
| 102 | 102 | ||
| 103 | 103 | target = "--target=" + asVersion; | |
| 104 | 104 | ||
| 105 | - dist-url = "--dist-url=https://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist"; | ||
| 105 | + distUrl = "--dist-url=https://gh-contractor-zcbenz.s3." + | ||
| 106 | + "amazonaws.com/atom-shell/dist"; | ||
| 106 | 107 | } | |
| 107 | 108 | else if (nwVersion) { | |
| 108 | 109 | builder = "nw-gyp"; | |
| 109 | 110 | target = "--target=" + nwVersion; | |
| 110 | 111 | } | |
| 111 | 112 | ||
| 112 | 113 | builder = path.resolve(".", "node_modules", ".bin", builder); | |
| 113 | - var cmd = [prefix, builder, "rebuild", target, disturl].join(" ").trim(); | ||
| 114 | + var cmd = [prefix, builder, "rebuild", target, debug, distUrl].join(" ").trim(); | ||
| 114 | 115 | ||
| 115 | 116 | return exec(cmd, opts) | |
| 116 | 117 | .then(function() { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -59,7 +59,7 @@ | |||
| 59 | 59 | "nodegit-promise": "~1.0.0", | |
| 60 | 60 | "npm": "^2.1.18", | |
| 61 | 61 | "promisify-node": "~0.1.2", | |
| 62 | - "which-native-nodish": "^1.0.0" | ||
| 62 | + "which-native-nodish": "^1.0.3" | ||
| 63 | 63 | }, | |
| 64 | 64 | "devDependencies": { | |
| 65 | 65 | "mocha": "~2.1.0", | |
0 commit comments