diff --git a/.travis.yml b/.travis.yml index 013991c948c..0e0d6686d95 100755 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,10 @@ 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 + - git lfs pull - 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 install: - nvm install $NODE_VERSION diff --git a/package.json b/package.json index 08628643ecf..4f37092b9fa 100644 --- a/package.json +++ b/package.json @@ -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", - "7zip-bin": "0.0.1" + "tmp": "0.0.28" }, "optionalDependencies": { - "appdmg": "^0.3.6" + "appdmg": "^0.3.6", + "7zip-bin": "0.0.2" }, "devDependencies": { "ava-tf": "^0.12.4-beta.6", diff --git a/src/builder.ts b/src/builder.ts index 2ddf42b7f6a..c08fd1f8bc8 100644 --- a/src/builder.ts +++ b/src/builder.ts @@ -40,7 +40,7 @@ export async function build(originalOptions?: BuildOptions): Promise { options.dist = true } else if (options.dist === undefined) { - options.dist = lifecycleEvent === "dist" || lifecycleEvent === "build" || lifecycleEvent.startsWith("dist:") + options.dist = lifecycleEvent === "dist" || lifecycleEvent === "build" || (lifecycleEvent != null && lifecycleEvent.startsWith("dist:")) } let isPublishOptionGuessed = false