Skip to content

Commit 68b56e9

Browse files
author
David Elentok
committed
fix(dotf): downgrade ripgrep to 12.1.1
Version 13.0 isn't working well with vim-grepper: mhinz/vim-grepper#244
1 parent 3623f5e commit 68b56e9

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

config/dotf-github.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"name": "nvim",
66
"github_repo": "neovim/neovim",
77
"strip_components": 1,
8-
"prerelease": false,
98
"platforms": {
109
"x86_64": {
1110
"bin_source": "bin/nvim",
@@ -33,6 +32,7 @@
3332
},
3433
{
3534
"name": "ripgrep",
35+
"version": "12.1.1",
3636
"github_repo": "BurntSushi/ripgrep",
3737
"bin_target": "rg",
3838
"strip_components": 1,
@@ -51,7 +51,7 @@
5151
{
5252
"name": "gron",
5353
"github_repo": "tomnomnom/gron",
54-
"prerelease": true,
54+
"version": "prerelease",
5555
"platforms": {
5656
"x86_64": {
5757
"asset_regexp": "gron-linux-amd64.*"

nvim/plugin/grep.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let g:grepper = {
99
" Grepper: keybindings {{{1
1010
" noremap <Leader>ff :Grepper -query '<c-r>=EscapeForQuery(expand("<cword>"))<cr>'<cr>
1111
" vnoremap <Leader>ff "9y:Grepper -query '<c-r>=EscapeRegisterForQuery(9)<cr>'<cr>
12-
" noremap <Leader>fc :Grepper<cr>
12+
noremap <Leader>fc :Grepper<cr>
1313
nmap gs <plug>(GrepperOperator)
1414
xmap gs <plug>(GrepperOperator)
1515

scripts/lib/github.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,19 @@ def fetch_releases(repo: str) -> List[Release]:
7070
return list(map(Release, data))
7171

7272

73-
def fetch_latest_release(repo: str, prerelease=False) -> Optional[Release]:
73+
def fetch_release(repo: str, version="latest") -> Optional[Release]:
7474
releases = fetch_releases(repo)
75-
if prerelease:
75+
if version == "prerelease":
7676
prereleases = [r for r in releases if r.prerelease]
7777
return prereleases[0]
7878

79+
if version == "latest":
80+
for release in releases:
81+
if not release.prerelease:
82+
return release
83+
7984
for release in releases:
80-
if not release.prerelease:
85+
if release.name == version:
8186
return release
87+
8288
return None

scripts/lib/package.py

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def __init__(self, raw):
2424
self.strip_components = raw.get("strip_components", 0)
2525
self.prerelease = raw.get("prerelease", False)
2626
self.extract = raw.get("extract", True)
27+
self.version = raw.get("version", "latest")
2728

2829
self.platform = None
2930
platform = raw["platforms"].get(MACHINE)

scripts/lib/package_installer.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ def installed_tag_name(self) -> Optional[str]:
6363

6464
def fetch_latest_asset(self) -> github.Asset:
6565
package = self.package
66-
prerelease = True if self.force_prerelease else package.prerelease
66+
version = "prerelease" if self.force_prerelease else package.version
6767

68-
print(" * fetching latest release...")
69-
release = github.fetch_latest_release(package.github_repo, prerelease)
68+
print(f" * fetching release {version}...")
69+
release = github.fetch_release(package.github_repo, version)
7070
if release is None:
7171
raise Exception(f"Could not find release for package {package.name}")
7272

0 commit comments

Comments
 (0)