Skip to content

Commit

Permalink
Added ripgrep dependency on vcredist2015
Browse files Browse the repository at this point in the history
This dependency requirement should go away once rust-lang/rust#37545
is implemented.

I'm creating version 0.2.9.1, which points to upstream 0.2.9 as a
package only version to get this dependency in.
  • Loading branch information
dstcruz committed Nov 18, 2016
1 parent 246b463 commit f25089b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 6 additions & 1 deletion packages/ripgrep/ripgrep.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<metadata>
<id>ripgrep</id>
<title>ripgrep</title>
<version>0.2.9</version>
<version>0.2.9.1</version>
<authors>BurntSushi</authors>
<owners>Daniel Santa Cruz</owners>
<summary>A search tool that combines the usability of ag with the raw speed of grep.</summary>
<description>
ripgrep is a command line search tool that combines the usability of The Silver Searcher (an ack clone)
with the raw speed of GNU grep. ripgrep has first class support on Windows, Mac and Linux, with binary
downloads available for every release.

We are currently depending on Visual C++ Redistributable for Visual Studio 2015 https://chocolatey.org/packages/vcredist2015. This will change once this https://github.com/rust-lang/rust/pull/37545 is resolved and ripgrep can statically link the CRT.
</description>
<projectUrl>https://github.com/BurntSushi/ripgrep</projectUrl>
<projectSourceUrl>https://github.com/BurntSushi/ripgrep</projectSourceUrl>
Expand All @@ -23,6 +25,9 @@
<copyright></copyright>
<licenseUrl>https://github.com/BurntSushi/ripgrep/blob/0.2.9/LICENSE-MIT</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="vcredist2015" />
</dependencies>
</metadata>
<files>
<file src="tools\**" target="tools" />
Expand Down
5 changes: 3 additions & 2 deletions packages/ripgrep/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
$ErrorActionPreference = 'Stop';

$version = "0.2.9"
$packageName = $env:chocolateyPackageName
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"

$url = ("https://github.com/BurntSushi/ripgrep/releases/download/{0}/ripgrep-{0}-i686-pc-windows-msvc.zip" -f $env:chocolateyPackageVersion)
$url64 = ("https://github.com/BurntSushi/ripgrep/releases/download/{0}/ripgrep-{0}-x86_64-pc-windows-msvc.zip" -f $env:chocolateyPackageVersion)
$url = ("https://github.com/BurntSushi/ripgrep/releases/download/{0}/ripgrep-{0}-i686-pc-windows-msvc.zip" -f $version)
$url64 = ("https://github.com/BurntSushi/ripgrep/releases/download/{0}/ripgrep-{0}-x86_64-pc-windows-msvc.zip" -f $version)

$packageArgs = @{
packageName = $packageName
Expand Down

0 comments on commit f25089b

Please sign in to comment.