From 2bab8dc02bbfaa17b81043e1557db67fe03ad40b Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 16 Mar 2018 01:25:19 +0100
Subject: [PATCH] Changing to the powershell version of nvm for better support.

---
 install-nvm-windows.ps1 | 29 -----------------------------
 run-tests.bat           | 16 ++++++----------
 2 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 install-nvm-windows.ps1

diff --git a/install-nvm-windows.ps1 b/install-nvm-windows.ps1
deleted file mode 100644
index b3794055..00000000
--- a/install-nvm-windows.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# We're going to store nvm-windows in the .\nvm directory.
-$env:NVM_HOME = (Get-Item -Path ".\" -Verbose).FullName + "\nvm"
-
-# Switching to TLS/1.2 - see https://githubengineering.com/crypto-removal-notice/
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-# Downloading and unpacking nvm-windows
-Invoke-WebRequest -Uri https://github.com/coreybutler/nvm-windows/releases/download/1.1.5/nvm-noinstall.zip -OutFile nvm-noinstall.zip
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-[System.IO.Compression.ZipFile]::ExtractToDirectory("nvm-noinstall.zip", "nvm")
-
-$env:Path = $env:NVM_HOME + ";" + $env:Path
-Out-File -Encoding "OEM" nvm\settings.txt
-nvm root $env:NVM_HOME
-"%*" | Out-File -Encoding "OEM" nvm\elevate.cmd
diff --git a/run-tests.bat b/run-tests.bat
index 547899e7..baf21778 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -15,26 +15,22 @@
 SET ROOT=%~dp0
 cd /d %~dp0
 
-PowerShell -Command .\install-nvm-windows.ps1
+powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }"
 
-SET NVM_HOME=%ROOT%nvm
-SET NVM_SYMLINK=%ROOT%nvm\nodejs
-SET PATH=%NVM_HOME%;%NVM_SYMLINK%;%PATH%
+SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH%
 SET JOBS=8
 
-nvm version
+call nvm version
 
-nvm install 8.5.0
-nvm use 8.5.0
+call nvm install 8
 
 call npm install || goto :error
 
 SET JUNIT_REPORT_STACK=1
 SET FAILED=0
 
-for %%v in (4.8.4 6.11.3 7.9.0 8.5.0) do (
-  nvm install %%v
-  nvm use %%v
+for %%v in (4 6 7 8) do (
+  call nvm install %%v
   call npm install -g npm
   node -e "console.log(process.versions)"