rootiest/fish-config
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(yt-dlp): wrapper with sane defaults + fish-deps shadow-detection fix #61

Merged
rootiest merged 3 commits from yt-dlp-wrapper-and-deps-fix into main 2026-06-22 04:57:13 +00:00
Conversation 0 Commits 3 Files Changed 8
+10 -5
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 878bc360d9 - Show all commits
functions/_fish_deps_install.fish
+3 -1
View File
@@ -22,7 +22,9 @@ function _fish_deps_install
# Determine if this dep needs attention: missing, or fish < 4.0 # Determine if this dep needs attention: missing, or fish < 4.0
set -l needs_install 0 set -l needs_install 0
set -l upgrade_label Install set -l upgrade_label Install
if not type -q $bin # command -q (not type -q): a wrapper function shadowing the name
# (rg, rm, yt-dlp) must not be mistaken for the installed binary.
if not command -q $bin
set needs_install 1 set needs_install 1
else if test "$bin" = fish else if test "$bin" = fish
set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2] set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2]
functions/_fish_deps_status.fish
+4 -2
View File
@@ -14,7 +14,9 @@ function _fish_deps_status
_fish_deps_catalog _fish_deps_catalog
function __fds_print_dep --argument-names bin tier function __fds_print_dep --argument-names bin tier
if type -q $bin # command -q (not type -q): probe PATH only, so wrapper functions that
# shadow a tool name (rg, rm, yt-dlp) don't mask a missing binary.
if command -q $bin
# Special version check: fish < 4.0 is functionally incompatible # Special version check: fish < 4.0 is functionally incompatible
if test "$bin" = fish if test "$bin" = fish
set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2] set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2]
@@ -28,7 +30,7 @@ function _fish_deps_status
end end
set_color green; echo -n " ✓ "; set_color normal set_color green; echo -n " ✓ "; set_color normal
echo -n "$bin " echo -n "$bin "
set_color brblack; echo "(Found at "(type -p $bin)")"; set_color normal set_color brblack; echo "(Found at "(command -s $bin)")"; set_color normal
else if test "$tier" = rec else if test "$tier" = rec
set_color yellow; echo -n " ⚠ "; set_color normal set_color yellow; echo -n " ⚠ "; set_color normal
echo -n "$bin " echo -n "$bin "
functions/_fish_deps_update.fish
+3 -2
View File
@@ -26,8 +26,9 @@ function _fish_deps_update
set -l i 1 set -l i 1
for bin in $_fdc_bins for bin in $_fdc_bins
# Skip fisher itself (handled above) and tools that aren't installed # Skip fisher itself (handled above) and tools that aren't installed.
if test "$bin" = fisher; or not type -q $bin # command -q (not type -q): ignore wrapper functions shadowing the name.
if test "$bin" = fisher; or not command -q $bin
set i (math $i + 1) set i (math $i + 1)
continue continue
end end