From 3ac78d2dc704a0be0dc0180e037a823b7624902c Mon Sep 17 00:00:00 2001 From: develar Date: Fri, 8 Apr 2016 12:43:54 +0200 Subject: [PATCH] fix: vendor/osx/7za seems to be broken Closes #296 --- .travis.yml | 3 ++- package.json | 6 +++--- src/builder.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 013991c948c..7f810cb1f42 100755 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,12 @@ addons: packages: - icnsutils - graphicsmagick + - git-lfs 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 install: diff --git a/package.json b/package.json index 08628643ecf..2127b987c80 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.1" }, "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