New Phase 1b in tests/run-tests.fish: catches a bare C1-shadowed-command call in a functions/*.fish body with no matching uses-shadow(name) or self-limiting(name) in that function's own CLASSIFICATION header. This is exactly the check discussed after the rm and cd audits -- runtime auto-unwrapping isn't viable in fish (there's no hook finer than shadowing itself, and rewriting behavior invisibly at runtime is its own footgun); a static lint using the CLASSIFICATION tag as the declared-intentional marker is. Scoped to functions/*.fish only: the one-function-per-file convention there makes body extraction exact with no block-depth parser needed. Added a new self-limiting(name) tag to the schema for the case a bare call is safe not because the caller did anything, but because the shadow's own logic already neutralizes the override: rm's and mkdir's flag checks (verified precisely -- rm falls back to command rm for any flag except a bare -r/-R/--recursive alone, which still routes to trash; mkdir falls back to command mkdir -p for any flag, no exception), and grep/fgrep/egrep/dir/vdir/cat's own tty auto-detection (--color=auto, and bat's default color behavior -- verified byte-identical to stock cat when piped, since bat also auto-disables highlighting on a non-terminal). Explicit and durable rather than a silent lint exemption: if a shadow's bypass condition is ever weakened, every self-limiting site is one grep away instead of silently wrong. Running the first draft of the lint surfaced three more real bugs, none previously audited: - config-help.fish's --man pager path checks `type -q less` (proving it wants the real less binary specifically, for less-only -R/+N flag syntax) then called it bare, routing through our own $PAGER -> ov -> less -> more -> cat fallback chain instead -- which could hand those less-specific flags to a completely different program. Now command less. - _fish_deps_install.fish and _fish_deps_update.fish's binary-upgrade paths cp a freshly downloaded binary over an already-installed one with no existence guard -- the update flow's target is guaranteed to already exist. Our cp shadow forces -i unconditionally (a plain alias, not flag-aware like rm's), so this would hang waiting on a confirmation prompt in any non-interactive run. Now command cp. Same two files' lazydocker install path piped curl output into bare bash, invoking our shell-switch wrapper instead of a plain subshell. Now command bash. - agents-init.fish's AGENTS.md/CLAUDE.md relocation calls mv bare in four places; each is already guarded by a preceding test -f check on the destination, so the -i alias was unlikely to ever fire in practice, but explicit command mv removes the reliance on that guard entirely rather than leaving it as the only thing standing between a file move and an unattended hang. The remaining ~65 flagged call sites across ~24 files were reviewed individually and tagged self-limiting(rm)/self-limiting(mkdir) (verified flagged with -f/-rf or -p) and self-limiting(grep)/ self-limiting(cat) (verified piped, captured, or -q/-c; none display color to a human), plus uses-shadow(ls) for two existence-check-only calls (cffetch.fish, ffetch.fish) whose output is redirected to /dev/null.
60 lines
1.9 KiB
Fish
60 lines
1.9 KiB
Fish
# Copyright (C) 2026 Rootiest
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
# COMPONENT
|
|
# autoexec/sync
|
|
#
|
|
# CLASSIFICATION
|
|
# self-limiting(rm), destructive
|
|
#
|
|
# SYNOPSIS
|
|
# __fish_user_dots_link
|
|
#
|
|
# DESCRIPTION
|
|
# Manages the git-ignored user-dots convenience symlink in the fish config
|
|
# directory ($__fish_config_dir/user-dots), pointing it at the resolved
|
|
# $__fish_user_dots_path so the private overlay can be browsed from
|
|
# ~/.config/fish/.
|
|
#
|
|
# Behaviour is controlled by the __fish_user_dots_symlink toggle:
|
|
# - explicit falsy (0/false/…) — remove our symlink if present and stop.
|
|
# Honoured regardless of C2, so opting out always cleans up.
|
|
# - unset or truthy (default) — create the link if missing and repoint it
|
|
# if the target changed. This is a C2 startup side-effect, so it only
|
|
# creates when __fish_config_op_autoexec is enabled.
|
|
#
|
|
# Only ever manages a symlink; a real file or directory at that path is left
|
|
# untouched.
|
|
#
|
|
# ARGUMENTS
|
|
# (none)
|
|
#
|
|
# EXIT STATUS
|
|
# 0 Always
|
|
#
|
|
# EXAMPLE
|
|
# __fish_user_dots_link
|
|
function __fish_user_dots_link --description 'Manage the user-dots convenience symlink'
|
|
set -l link "$__fish_config_dir/user-dots"
|
|
set -q __fish_user_dots_path
|
|
or set -l __fish_user_dots_path "$XDG_CONFIG_HOME/.user-dots/fish"
|
|
|
|
# Explicit opt-out: remove our symlink (never a real file/dir) and stop.
|
|
__fish_variable_check __fish_user_dots_symlink
|
|
if test $status -eq 1
|
|
test -L "$link"; and rm -f "$link"
|
|
return 0
|
|
end
|
|
|
|
# Enabled: creation is a C2 startup side-effect.
|
|
__fish_config_op_enabled (status current-function); or return 0
|
|
|
|
test -d "$__fish_user_dots_path"; or return 0
|
|
if test -L "$link"
|
|
test (readlink "$link") != "$__fish_user_dots_path"
|
|
and ln -sfn "$__fish_user_dots_path" "$link"
|
|
else if not test -e "$link"
|
|
ln -s "$__fish_user_dots_path" "$link"
|
|
end
|
|
end
|