mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 21:07:03 +01:00
Krzysztof kuhy Rudnicki
4f2b0ccdf7
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
87 lines
2.5 KiB
Bash
Executable File
87 lines
2.5 KiB
Bash
Executable File
#!/bin/bash
|
|
# Linter installation: command probes, Arch/AUR detection, and the pacman /
|
|
# AUR-helper dispatch for shellcheck, shfmt, checkbashisms and bashate.
|
|
#
|
|
# Sourced by shell_check.sh; split out to keep it under the 250-line cap.
|
|
# Sourced rather than run, so it inherits the caller's options and reads
|
|
# SKIP_INSTALL and VERBOSE, which the entry sets from its arguments above the
|
|
# source line.
|
|
|
|
is_cmd() { command -v "$1" >/dev/null 2>&1; }
|
|
|
|
is_arch() { is_cmd pacman; }
|
|
have_aur_helper() { is_cmd yay || is_cmd paru; }
|
|
|
|
install_if_missing() {
|
|
local pkg cmd
|
|
pkg="$1"
|
|
cmd="$2"
|
|
if is_cmd "$cmd"; then
|
|
[[ $VERBOSE == "true" ]] && log_info "Found $cmd"
|
|
return 0
|
|
fi
|
|
|
|
if [[ $SKIP_INSTALL == "true" ]]; then
|
|
log_warn "Skipping install of $pkg ($cmd not found)"
|
|
return 1
|
|
fi
|
|
|
|
if is_arch; then
|
|
log_info "Installing $pkg via pacman..."
|
|
if ! sudo pacman -S --needed --noconfirm "$pkg"; then
|
|
log_warn "Failed to install $pkg via pacman."
|
|
return 1
|
|
fi
|
|
return 0
|
|
else
|
|
log_warn "Non-Arch system detected. Please install '$pkg' manually."
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
install_linters() {
|
|
local ok=0
|
|
|
|
# Core linters
|
|
install_if_missing shellcheck shellcheck || ok=1
|
|
install_if_missing shfmt shfmt || ok=1
|
|
|
|
# Optional linters (best-effort)
|
|
# checkbashisms may be in repos or AUR; try pacman first, then AUR helper
|
|
if ! is_cmd checkbashisms; then
|
|
if is_arch; then
|
|
if ! sudo pacman -S --needed --noconfirm checkbashisms 2>/dev/null; then
|
|
if have_aur_helper; then
|
|
log_info "Installing checkbashisms from AUR (requires yay/paru)..."
|
|
if is_cmd yay; then yay -S --noconfirm checkbashisms || true; fi
|
|
if is_cmd paru; then paru -S --noconfirm checkbashisms || true; fi
|
|
else
|
|
log_warn "checkbashisms not installed (no AUR helper)."
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
# bashate (python-based), typically available as python-bashate in AUR
|
|
if ! is_cmd bashate; then
|
|
if is_arch && have_aur_helper; then
|
|
log_info "Installing bashate from AUR (requires yay/paru)..."
|
|
if is_cmd yay; then yay -S --noconfirm python-bashate || true; fi
|
|
if is_cmd paru; then paru -S --noconfirm python-bashate || true; fi
|
|
else
|
|
# Try pip if user has it and wants to
|
|
if is_cmd pipx; then
|
|
log_info "Installing bashate via pipx..."
|
|
pipx install bashate || true
|
|
elif is_cmd pip3; then
|
|
log_info "Installing bashate via pip (user)..."
|
|
pip3 install --user bashate || true
|
|
else
|
|
log_warn "bashate not installed (no AUR helper or pip available)."
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
return "$ok"
|
|
}
|