diff options
| author |  Peter Mounce <petermounce@improbable.io> | 2016-10-24 13:38:42 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-10-24 19:30:01 +0000 |
| commit | e7ab8a7975add1a4c0bad9481ef7be08720214c7 (patch) | |
| tree | 2f9e5fd4b523e9ecdadf789e1103bc8d1816eb81 /scripts | |
| parent | 1a53705327ed24c524c8e21e1fd710e6997e5013 (diff) | |
Fix chocolatey package build scripts - minor fixes.
Closes #1949.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/1949
MOS_MIGRATED_REVID=137022912
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/packages/chocolatey/build.ps1 | 2 | ||||
| -rw-r--r-- | scripts/packages/chocolatey/chocolateyinstall.ps1.template | 4 | ||||
| -rw-r--r-- | scripts/packages/chocolatey/test.ps1 | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/scripts/packages/chocolatey/build.ps1 b/scripts/packages/chocolatey/build.ps1 index 032c6c8249..9500e88f1d 100644 --- a/scripts/packages/chocolatey/build.ps1 +++ b/scripts/packages/chocolatey/build.ps1 @@ -16,6 +16,8 @@ rm -force -ErrorAction SilentlyContinue ./*.nupkg rm -force -ErrorAction SilentlyContinue ./*.zip rm -force -ErrorAction SilentlyContinue ./bazel.nuspec rm -force -ErrorAction SilentlyContinue ./tools/chocolateyinstall.ps1 +rm -force -ErrorAction SilentlyContinue ./tools/chocolateyuninstall.ps1 +rm -force -ErrorAction SilentlyContinue ./tools/LICENSE.txt if ($isRelease) { Invoke-WebRequest "$($tvUri).sha256" -UseBasicParsing -passthru -outfile sha256.txt diff --git a/scripts/packages/chocolatey/chocolateyinstall.ps1.template b/scripts/packages/chocolatey/chocolateyinstall.ps1.template index beadbd4a63..abb2f63045 100644 --- a/scripts/packages/chocolatey/chocolateyinstall.ps1.template +++ b/scripts/packages/chocolatey/chocolateyinstall.ps1.template @@ -9,10 +9,6 @@ ps_var_checksumType64 = ps_var_checksumType ps_var_toolsDir = Split-Path -parent ps_var_MyInvocation.MyCommand.Definition ps_var_packageDir = Split-Path -parent ps_var_toolsDir ps_var_binRoot = (Get-ToolsLocation) -replace "\\", "/" -write-host "package directory: ps_var_packageDir" -write-host "destination directory: ps_var_packageDir" -write-host "url: ps_var_url" -write-host "url64bit: ps_var_url64bit" Install-ChocolateyZipPackage -PackageName "ps_var_packageName" escape_char -Url "ps_var_url" escape_char diff --git a/scripts/packages/chocolatey/test.ps1 b/scripts/packages/chocolatey/test.ps1 index 642cd2b05e..91db5b7763 100644 --- a/scripts/packages/chocolatey/test.ps1 +++ b/scripts/packages/chocolatey/test.ps1 @@ -4,7 +4,7 @@ param( choco uninstall bazel --force -y -choco install "./bazel.$($version).nupkg" --verbose --debug --force -y +choco install bazel --verbose --debug --force -y -s ".;https://chocolatey.org/api/v2/" if ($LASTEXITCODE -ne 0) { @@ -16,8 +16,8 @@ write-host @" The package should have installed without errors. Now: -* open an msys2 shell +* open a new shell (this should work in msys2, cmd, powershell) * Make sure your environment is accurate (see ``./tools/chocolateyinstall.ps1`` output) -* run ``bazel version`` in that msys2 shell +* run ``bazel version`` in that shell * ... and you should get a version number back "@ |