fix: vendor/osx/7za seems to be broken

Closes electron-userland#296
develar · Apr 8, 2016 · 3ac78d2 · 3ac78d2
1 parent 487164d
commit 3ac78d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -40,7 +40,7 @@ export async function build(originalOptions?: BuildOptions): Promise<void> {
     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