From 353ee94bbb10043252fb5b4e5b783a36e70dab01 Mon Sep 17 00:00:00 2001 From: jdx <216188+jdx@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:22:46 -0500 Subject: [PATCH] fix: make ubi installs with exe work for `mise x` (#2825) --- docs/registry.md | 3 +-- src/toolset/tool_request.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/registry.md b/docs/registry.md index 3068f768b..959019c59 100644 --- a/docs/registry.md +++ b/docs/registry.md @@ -220,8 +220,7 @@ editLink: false | esy | [asdf:asdf-community/asdf-esy](https://github.com/asdf-community/asdf-esy) | | etcd | [asdf:particledecay/asdf-etcd](https://github.com/particledecay/asdf-etcd) | | evans | [asdf:goki90210/asdf-evans](https://github.com/goki90210/asdf-evans) | -| exa | [asdf:nyrst/asdf-exa](https://github.com/nyrst/asdf-exa) | -| eza | [asdf:lwiechec/asdf-eza](https://github.com/lwiechec/asdf-eza) | +| eza | [ubi:eza-community/eza](https://github.com/eza-community/eza) | | fd | [asdf:https://gitlab.com/wt0f/asdf-fd](https://gitlab.com/wt0f/asdf-fd) | | ffmpeg | [asdf:acj/asdf-ffmpeg](https://github.com/acj/asdf-ffmpeg) | | figma-export | [asdf:younke/asdf-figma-export](https://github.com/younke/asdf-figma-export) | diff --git a/src/toolset/tool_request.rs b/src/toolset/tool_request.rs index 018de5c25..011b1124b 100644 --- a/src/toolset/tool_request.rs +++ b/src/toolset/tool_request.rs @@ -46,30 +46,30 @@ impl ToolRequest { }; Ok(match s.split_once(':') { Some((ref_type @ ("ref" | "tag" | "branch" | "rev"), r)) => Self::Ref { - backend, ref_: r.to_string(), ref_type: ref_type.to_string(), - options: Default::default(), + options: backend.opts.clone().unwrap_or_default(), + backend, }, Some(("prefix", p)) => Self::Prefix { - backend, prefix: p.to_string(), - options: Default::default(), + options: backend.opts.clone().unwrap_or_default(), + backend, }, Some(("path", p)) => Self::Path(backend, PathBuf::from(p)), Some((p, v)) if p.starts_with("sub-") => Self::Sub { - backend, sub: p.split_once('-').unwrap().1.to_string(), orig_version: v.to_string(), + backend, }, None => { if s == "system" { Self::System(backend) } else { Self::Version { - backend, version: s, - options: Default::default(), + options: backend.opts.clone().unwrap_or_default(), + backend, } } }