Skip to content

Commit

Permalink
fix: vendor/osx/7za seems to be broken
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Apr 8, 2016
1 parent 2cc5337 commit 50ac141
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ addons:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-tar dpkg libicns graphicsmagick git-lfs; fi
- git lfs pull
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git lfs pull; fi
- gem install --no-rdoc --no-ri fpm
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -L https://github.com/github/git-lfs/releases/download/v1.1.2/git-lfs-linux-amd64-1.1.2.tar.gz | tar -xz; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git-lfs-1.1.2/git-lfs pull; fi
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
"progress-stream": "^1.2.0",
"read-package-json": "^2.0.3",
"source-map-support": "^0.4.0",
"tmp": "0.0.28"
"tmp": "0.0.28",
"7zip-bin": "0.0.2"
},
"optionalDependencies": {
"appdmg": "^0.3.6",
"7zip-bin": "0.0.2"
"appdmg": "^0.3.6"
},
"devDependencies": {
"ava-tf": "^0.12.4-beta.6",
Expand Down
3 changes: 2 additions & 1 deletion src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import readPackageJsonAsync = require("read-package-json")
import * as os from "os"
import * as path from "path"
import { readJson } from "fs-extra-p"
import { platform } from "os";

//noinspection JSUnusedLocalSymbols
const __awaiter = require("./awaiter")
Expand Down Expand Up @@ -35,7 +36,7 @@ export function installDependencies(appDir: string, electronVersion: string, arc
let npmExecPath = process.env.npm_execpath || process.env.NPM_CLI_JS
const npmExecArgs = [command, "--production"]
if (npmExecPath == null) {
npmExecPath = "npm"
npmExecPath = process.platform === "win32" ? "npm.cmd" : "npm"
}
else {
npmExecArgs.unshift(npmExecPath)
Expand Down

0 comments on commit 50ac141

Please sign in to comment.