cb30f19c32
Add __fish_real_command, which walks all PATH matches for a name and returns the first that is NOT one of this config's generated wrappers (identified by the "# <name>-wrapper-version:" marker; grep -I treats real ELF binaries as no-match so only our text shims are skipped). It never returns one of our own wrappers, so a caller embedding the result can't build a shim that recurses into itself. Use it for the fish-deps status "(Found at ...)" path so paru/yay show the real binary instead of the ~/.local/bin logging shim.
61 lines
2.3 KiB
Fish
61 lines
2.3 KiB
Fish
# Copyright (C) 2026 Rootiest
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
# SYNOPSIS
|
|
# _fish_deps_status
|
|
#
|
|
# DESCRIPTION
|
|
# Prints a colored installed/missing status report for all managed fish shell
|
|
# dependencies, grouped by tier (required, integrations, recommended).
|
|
#
|
|
# EXAMPLE
|
|
# _fish_deps_status
|
|
function _fish_deps_status
|
|
_fish_deps_catalog
|
|
|
|
function __fds_print_dep --argument-names bin tier
|
|
# 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
|
|
if test "$bin" = fish
|
|
set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2]
|
|
if test -n "$_major"; and test "$_major" -lt 4
|
|
set -l _ver (fish --version 2>&1 | string replace 'fish, ' '')
|
|
set_color yellow; echo -n " ⚠ "; set_color normal
|
|
echo -n "$bin "
|
|
set_color brblack; echo "($_ver — upgrade to 4.0+ required)"; set_color normal
|
|
return
|
|
end
|
|
end
|
|
set_color green; echo -n " ✓ "; set_color normal
|
|
echo -n "$bin "
|
|
set_color brblack; echo "(Found at "(__fish_real_command $bin)")"; set_color normal
|
|
else if test "$tier" = rec
|
|
set_color yellow; echo -n " ⚠ "; set_color normal
|
|
echo -n "$bin "
|
|
set_color brblack; echo "(Not installed)"; set_color normal
|
|
else
|
|
set_color red; echo -n " ✗ "; set_color normal
|
|
echo -n "$bin "
|
|
set_color brblack; echo "(Not installed)"; set_color normal
|
|
end
|
|
end
|
|
|
|
for tier_label in "Required Dependencies:req" "Integrations:int" "Recommended Dependencies:rec"
|
|
set -l label (string split : $tier_label)[1]
|
|
set -l tier (string split : $tier_label)[2]
|
|
set_color cyan; echo $label; set_color normal
|
|
set -l i 1
|
|
for bin in $_fdc_bins
|
|
if test "$_fdc_tiers[$i]" = $tier
|
|
__fds_print_dep $bin $tier
|
|
end
|
|
set i (math $i + 1)
|
|
end
|
|
echo ""
|
|
end
|
|
|
|
functions -e __fds_print_dep
|
|
end
|