Skip to content

Commit

Permalink
fix(windows): use cross-spawn module to avoid path issues on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
edvald committed Oct 8, 2018
1 parent d91327e commit 082964c
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 7 deletions.
31 changes: 27 additions & 4 deletions garden-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions garden-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"cli-cursor": "^2.1.0",
"cli-highlight": "^2.0.0",
"cli-truncate": "^1.1.0",
"cross-spawn": "^6.0.5",
"cryo": "0.0.6",
"dedent": "^0.7.0",
"deep-diff": "^1.0.1",
Expand Down Expand Up @@ -82,6 +83,7 @@
"@types/async-lock": "^1.1.0",
"@types/bluebird": "^3.5.23",
"@types/chai": "^4.1.4",
"@types/cross-spawn": "^6.0.0",
"@types/dedent": "^0.7.0",
"@types/deep-diff": "0.0.31",
"@types/dockerode": "^2.5.5",
Expand Down
2 changes: 1 addition & 1 deletion garden-service/src/plugins/google/gcloud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { spawn } from "child_process"
import * as spawn from "cross-spawn"
import { extend } from "lodash"
import { spawnPty } from "../../util/util"

Expand Down
3 changes: 2 additions & 1 deletion garden-service/src/plugins/kubernetes/kubectl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
*/

import chalk from "chalk"
import { ChildProcess, spawn } from "child_process"
import { ChildProcess } from "child_process"
import * as spawn from "cross-spawn"
import { extend } from "lodash"
import { encodeYamlMulti, spawnPty } from "../../util/util"
import { RuntimeError } from "../../exceptions"
Expand Down
2 changes: 1 addition & 1 deletion garden-service/src/util/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as exitHook from "async-exit-hook"
import * as klaw from "klaw"
import * as yaml from "js-yaml"
import * as Cryo from "cryo"
import { spawn as _spawn } from "child_process"
import * as _spawn from "cross-spawn"
import { pathExists, readFile, writeFile } from "fs-extra"
import { join, basename, win32, posix } from "path"
import { find, pick, difference, fromPairs } from "lodash"
Expand Down

0 comments on commit 082964c

Please sign in to comment.