More Windows script fixes

packages/grpc-tools/build_binaries.ps1

@@ -1,6 +1,6 @@
 Install-PackageProvider -Name NuGet -RequiredVersion 2.8.5.201 -Force
 Import-PackageProvider -Name NuGet -RequiredVersion 2.8.5.201
-Install-Module -Name 7Zip4Powershell
+Install-Module -Force -Name 7Zip4Powershell
 
 function MkDir-p($Path) {
     $FullPath = "\\?\" + $Path
@@ -14,7 +14,7 @@ $WellKnownProtos = "any","api","compiler/plugin","descriptor","duration","empty"
 $Base = $PSScriptRoot
 cd $Base
 $ProtobufBase = $Base + "/deps/protobuf"
-MkDir-p ($Base + "/build/bin")
+MkDir-p ($Base + "/build/bin/google/protobuf/compiler")
 
 $PackageFile = $Base + "/package.json"
 $ToolsVersion = (Get-Content $PackageFile) -join "`n" | ConvertFrom-Json | Get-Member -Name version

test/kokoro-nodejs-build-test.bat

@@ -1,5 +1,10 @@
 cd /d %~dp0
 cd ..
 
-call ./tools/release/kokoro-nodejs.bat
-call ./tools/release/kokoro-grpc-tools.bat
+call ./tools/release/kokoro-nodejs.bat || goto :error
+call ./tools/release/kokoro-grpc-tools.bat || goto :error
+
+goto :EOF
+
+:error
+exit /b 1

tools/release/kokoro-grpc-tools.bat

@@ -1,5 +1,5 @@
 cd /d %~dp0
 cd ../..
 
-set ARTIFACTS_OUT=artifacts
+set ARTIFACTS_OUT=%cd%/artifacts
 powershell -File ./packages/grpc-tools/build_binaries.ps1 || exit /b 1