From 1435710c16bed4e58048a73ed3c50e4148338194 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Mon, 14 Sep 2020 20:00:16 -0700
Subject: [PATCH] (experiment) Use npx for create-dmg

---
 .travis.yml     | 5 +++++
 build.sh        | 1 -
 create_dmg.sh   | 2 +-
 install_deps.sh | 5 +----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 621c20f..805dbe2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,11 @@ matrix:
       env: BUILDARCH=arm
       dist: trusty
     - os: osx
+      addons:
+        homebrew:
+          packages:
+            - jq
+            - zip
 
 language: node_js
 node_js: "12.14.1"
diff --git a/build.sh b/build.sh
index d31cded..4283f1b 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   yarn gulp minify-vscode
 
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm install --global create-dmg
     yarn gulp vscode-darwin-min-ci
   elif [[ "$CI_WINDOWS" == "True" ]]; then
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
diff --git a/create_dmg.sh b/create_dmg.sh
index 07106df..6ba16f4 100755
--- a/create_dmg.sh
+++ b/create_dmg.sh
@@ -2,7 +2,7 @@
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin
-    create-dmg VSCodium.app ..
+    npx create-dmg VSCodium.app ..
     mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
   fi
   cd ..
diff --git a/install_deps.sh b/install_deps.sh
index b36f5bd..d0e6b7c 100755
--- a/install_deps.sh
+++ b/install_deps.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  brew update
-  brew install jq zip
-else
+if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
   sudo apt-get update
   sudo apt-get install -y fakeroot jq
   triplet=