From c0fd0eba1b727081485a6661c62408e59d85fd4f Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 17 May 2017 16:37:26 +0200 Subject: [PATCH] tfs: fix npm distro install --- build/tfs/darwin/build.sh | 5 +++-- build/tfs/linux/build.sh | 5 +++-- scripts/env.sh | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 scripts/env.sh diff --git a/build/tfs/darwin/build.sh b/build/tfs/darwin/build.sh index fb71e9885e1..88e4e11648c 100755 --- a/build/tfs/darwin/build.sh +++ b/build/tfs/darwin/build.sh @@ -1,6 +1,7 @@ #!/bin/sh -. build/tfs/common/common.sh +. ./scripts/env.sh +. ./build/tfs/common/common.sh export VSCODE_MIXIN_PASSWORD="$1" export AZURE_STORAGE_ACCESS_KEY="$2" @@ -12,7 +13,7 @@ VSO_PAT="$6" echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc step "Install dependencies" \ - ./scripts/npm.sh install + npm install step "Mix in repository from vscode-distro" \ npm run gulp -- mixin diff --git a/build/tfs/linux/build.sh b/build/tfs/linux/build.sh index f86e9f71827..ec5485416e5 100755 --- a/build/tfs/linux/build.sh +++ b/build/tfs/linux/build.sh @@ -1,6 +1,7 @@ #!/bin/bash -. build/tfs/common/common.sh +. ./scripts/env.sh +. ./build/tfs/common/common.sh export ARCH="$1" export VSCODE_MIXIN_PASSWORD="$2" @@ -14,7 +15,7 @@ VSO_PAT="$8" echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc step "Install dependencies" \ - ./scripts/npm.sh install --arch=$ARCH --unsafe-perm + npm install --arch=$ARCH --unsafe-perm step "Mix in repository from vscode-distro" \ npm run gulp -- mixin diff --git a/scripts/env.sh b/scripts/env.sh new file mode 100755 index 00000000000..66860f099fe --- /dev/null +++ b/scripts/env.sh @@ -0,0 +1,6 @@ +#!/bin/bash +export npm_config_disturl=https://atom.io/download/electron +export npm_config_target=$(node -p "require('./package.json').version") +export npm_config_runtime=electron +export npm_config_cache="$HOME/.npm-electron" +mkdir -p "$npm_config_cache" \ No newline at end of file