fix(fish-deps): filter fish-* tags only; fix starship sh -s flag

git tag --list 'fish-*' replaces for-each-ref so old pre-Rust tags like
pre_whitespace_fix (which have no Cargo.toml) are never selected.

starship update: sh -s -- --yes correctly passes --yes to the piped
install script instead of treating it as a filename for sh to open.
This commit is contained in:
2026-05-18 23:46:34 -04:00
parent a351e62a17
commit a7510cc8ea
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -228,7 +228,7 @@ function _fish_deps_install
set -l _build_ok 0 set -l _build_ok 0
git clone https://github.com/fish-shell/fish-shell "$_tmpdir" git clone https://github.com/fish-shell/fish-shell "$_tmpdir"
and begin and begin
set -l _tag (git -C "$_tmpdir" for-each-ref refs/tags/ --format '%(refname:short)' --sort=version:refname | tail -1) set -l _tag (git -C "$_tmpdir" tag --list 'fish-*' --sort=version:refname | tail -1)
test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag" test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag"
true true
end end
+2 -2
View File
@@ -110,7 +110,7 @@ function _fish_deps_update
set -l _build_ok 0 set -l _build_ok 0
git clone https://github.com/fish-shell/fish-shell "$_tmpdir" git clone https://github.com/fish-shell/fish-shell "$_tmpdir"
and begin and begin
set -l _tag (git -C "$_tmpdir" for-each-ref refs/tags/ --format '%(refname:short)' --sort=version:refname | tail -1) set -l _tag (git -C "$_tmpdir" tag --list 'fish-*' --sort=version:refname | tail -1)
test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag" test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag"
true true
end end
@@ -145,7 +145,7 @@ function _fish_deps_update
if test "$special" = curl-installer if test "$special" = curl-installer
if test "$bin" = starship if test "$bin" = starship
echo "Updating $bin..." echo "Updating $bin..."
curl -sS https://starship.rs/install.sh | sh -- --yes curl -sS https://starship.rs/install.sh | sh -s -- --yes
set updated_any 1 set updated_any 1
end end
set i (math $i + 1) set i (math $i + 1)