From 9bfcb6e9a828df137068e23de0fe34d2899384bc Mon Sep 17 00:00:00 2001
From: Peter Mounce <petermounce@improbable.io>
Date: Wed, 15 Mar 2017 09:06:14 +0000
Subject: Fix #2671 on GitHub

Closes #2678.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2678
PiperOrigin-RevId: 150167309
MOS_MIGRATED_REVID=150167309
---
 scripts/packages/chocolatey/.gitignore                  |  4 ++--
 scripts/packages/chocolatey/build.ps1                   |  8 ++++----
 scripts/packages/chocolatey/tools/chocolateyinstall.ps1 | 12 +++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'scripts/packages')

diff --git a/scripts/packages/chocolatey/.gitignore b/scripts/packages/chocolatey/.gitignore
index 6bf4f7c838..6e761153f3 100644
--- a/scripts/packages/chocolatey/.gitignore
+++ b/scripts/packages/chocolatey/.gitignore
@@ -2,5 +2,5 @@
 *.zip
 bazel.nuspec
 tools/*.exe
-tools/LICENSE
-tools/params.json
+tools/LICENSE*
+tools/params.txt
diff --git a/scripts/packages/chocolatey/build.ps1 b/scripts/packages/chocolatey/build.ps1
index 2b196d9415..2a652b1625 100644
--- a/scripts/packages/chocolatey/build.ps1
+++ b/scripts/packages/chocolatey/build.ps1
@@ -33,10 +33,10 @@ if ($fixPackage -eq $true) {
   }
   $tvPackageFixVersion = "$($prefix)$((get-date).tostring("yyyyMMdd"))"
 }
-rm -force -ErrorAction SilentlyContinue ./*.nupkg
-rm -force -ErrorAction SilentlyContinue ./bazel.nuspec
-rm -force -ErrorAction SilentlyContinue ./tools/LICENSE
-rm -force -ErrorAction SilentlyContinue ./tools/*.orig
+rm -force -ErrorAction SilentlyContinue "./*.nupkg"
+rm -force -ErrorAction SilentlyContinue "./bazel.nuspec"
+rm -force -ErrorAction SilentlyContinue "./tools/LICENSE*"
+rm -force -ErrorAction SilentlyContinue "./tools/*.orig"
 rm -force -ErrorAction SilentlyContinue "./tools/params.*"
 if ($checksum -eq "") {
   rm -force -ErrorAction SilentlyContinue ./*.zip
diff --git a/scripts/packages/chocolatey/tools/chocolateyinstall.ps1 b/scripts/packages/chocolatey/tools/chocolateyinstall.ps1
index 2690150391..dcfa0a6cf7 100644
--- a/scripts/packages/chocolatey/tools/chocolateyinstall.ps1
+++ b/scripts/packages/chocolatey/tools/chocolateyinstall.ps1
@@ -3,16 +3,18 @@ $packageName = 'bazel'
 
 $toolsDir = Split-Path -parent $MyInvocation.MyCommand.Definition
 $paramsText = get-content "$($toolsDir)\params.txt"
-$p = $paramsText.Split("`n")
+write-host "Content of $($toolsDir)\params.txt:"
+write-host $paramsText
+write-host "url:  $($paramsText[0])"
+write-host "hash: $($paramsText[1])"
+write-host "Type: $($paramsText.GetType())"
 
 $packageDir = Split-Path -parent $toolsDir
 
-write-host "Read params from text file"
-write-host $p
 
 Install-ChocolateyZipPackage -PackageName "$packageName" `
-  -Url64bit "$($p[0])" `
-  -Checksum64 "$($p[1])" `
+  -Url64bit "$($paramsText[0])" `
+  -Checksum64 "$($paramsText[1])" `
   -Checksum64Type "sha256" `
   -UnzipLocation "$packageDir"
 
-- 
cgit v1.2.3