diff options
| author |  Peter Mounce <petermounce@improbable.io> | 2017-03-06 18:30:13 +0000 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-03-07 10:46:54 +0000 |
| commit | ddcfc61a2dff9cdf2ea03ffa4dc3707aafb28b0e (patch) | |
| tree | 6e5824e41e983eea812a7ba71f4be8d0b342c647 /scripts/packages/chocolatey/tools | |
| parent | 91b4ad5d538b77f77b71b660d3079b60c4de8057 (diff) | |
Fix powershellv2
Powershell v2 (win7 vintage) doesn't have json cmdlets.
Got a report via chocolatey.org message that this doesn't work on win7. Cried. Replaced with simpler text file based approach for separating data from code.
Also fix package version fix notation bit of the automation to produce version numbers valid with chocolatey/nuspec.
I've already published a fixed 0.4.5-rc2 and 0.4.4 with this
* https://chocolatey.org/packages/bazel/0.4.4.20170306
* https://chocolatey.org/packages/bazel/0.4.5-rc2-20170306-124051
Closes #2633.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2633
PiperOrigin-RevId: 149314972
MOS_MIGRATED_REVID=149314972
Diffstat (limited to 'scripts/packages/chocolatey/tools')
| -rw-r--r-- | scripts/packages/chocolatey/tools/chocolateyinstall.ps1 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/scripts/packages/chocolatey/tools/chocolateyinstall.ps1 b/scripts/packages/chocolatey/tools/chocolateyinstall.ps1 index fbd3cc32b0..2690150391 100644 --- a/scripts/packages/chocolatey/tools/chocolateyinstall.ps1 +++ b/scripts/packages/chocolatey/tools/chocolateyinstall.ps1 @@ -2,22 +2,18 @@ $ErrorActionPreference = 'Stop'; # stop on all errors $packageName = 'bazel' $toolsDir = Split-Path -parent $MyInvocation.MyCommand.Definition -$json = gc "$toolsDir\params.json" -$p = (($json) -join "`n") | convertfrom-json +$paramsText = get-content "$($toolsDir)\params.txt" +$p = $paramsText.Split("`n") $packageDir = Split-Path -parent $toolsDir -$binRoot = (Get-ToolsLocation) -replace "\\", "/" -write-host "Read params from json" -write-host (convertto-json $p) +write-host "Read params from text file" +write-host $p Install-ChocolateyZipPackage -PackageName "$packageName" ` - -Url "$($p.package.uri)" ` - -Checksum "$($p.package.checksum)" ` - -ChecksumType "$($p.package.checksumType)" ` - -Url64bit "$($p.package.uri)" ` - -Checksum64 "$($p.package.checksum)" ` - -Checksum64Type "$($p.package.checksumType)" ` + -Url64bit "$($p[0])" ` + -Checksum64 "$($p[1])" ` + -Checksum64Type "sha256" ` -UnzipLocation "$packageDir" write-host "Ensure that msys2 dll is present in PATH to allow bazel to be run from non-msys2 shells" |