mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-13 23:10:49 +01:00
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
132 lines
4.2 KiB
Bash
Executable File
132 lines
4.2 KiB
Bash
Executable File
#!/bin/bash
|
|
# Stale pairing removal, service restart and USB autosuspend.
|
|
#
|
|
# Sourced by fix_bluetooth.sh; split out to keep it under the 250-line
|
|
# cap. Sourced rather than run, so it inherits the caller's strict mode
|
|
# and the variables defined above the source line.
|
|
|
|
# ==========================================================================
|
|
# 5. Remove stale pairing for target device (if specified)
|
|
# ==========================================================================
|
|
remove_stale_pairing() {
|
|
if [[ -z $TARGET_MAC ]]; then
|
|
return 0
|
|
fi
|
|
|
|
echo ""
|
|
log_info "Checking for stale pairing with $TARGET_MAC..."
|
|
|
|
local info
|
|
info=$(_btctl info "$TARGET_MAC" || true)
|
|
|
|
if echo "$info" | grep -q "Device $TARGET_MAC"; then
|
|
local paired
|
|
paired=$(echo "$info" | grep "Paired:" | awk '{print $2}')
|
|
local connected
|
|
connected=$(echo "$info" | grep "Connected:" | awk '{print $2}')
|
|
|
|
if [[ $paired == "yes" && $connected == "no" ]]; then
|
|
log_warn "Device is paired but NOT connected — may have stale pairing."
|
|
apply_fix "Removing stale pairing for $TARGET_MAC" \
|
|
_btctl remove "$TARGET_MAC"
|
|
elif [[ $paired == "no" ]]; then
|
|
log_info "Device is not currently paired."
|
|
else
|
|
log_ok "Device is paired and connected."
|
|
fi
|
|
else
|
|
log_info "Device $TARGET_MAC not found in bluetoothctl. Fresh pairing needed."
|
|
fi
|
|
}
|
|
|
|
# ==========================================================================
|
|
# 6. Restart Bluetooth service to apply changes
|
|
# ==========================================================================
|
|
restart_bluetooth() {
|
|
echo ""
|
|
if [[ $FIXES_APPLIED -gt 0 ]]; then
|
|
apply_fix "Restarting bluetooth.service to apply changes" \
|
|
systemctl restart bluetooth.service
|
|
else
|
|
log_info "No fixes applied — skipping service restart."
|
|
fi
|
|
}
|
|
|
|
# ==========================================================================
|
|
# 7. Disable USB autosuspend for Bluetooth adapter
|
|
# ==========================================================================
|
|
fix_usb_autosuspend() {
|
|
echo ""
|
|
log_info "Checking USB autosuspend for Bluetooth adapter..."
|
|
|
|
local bt_usb
|
|
bt_usb=$(lsusb 2>/dev/null | grep -i bluetooth | head -1 || true)
|
|
if [[ -z $bt_usb ]]; then
|
|
return 0
|
|
fi
|
|
|
|
local usb_id
|
|
usb_id=$(echo "$bt_usb" | grep -oP 'ID \K[0-9a-f]{4}:[0-9a-f]{4}' || true)
|
|
if [[ -z $usb_id ]]; then
|
|
return 0
|
|
fi
|
|
|
|
local vendor="${usb_id%%:*}"
|
|
local product="${usb_id##*:}"
|
|
|
|
# Find the sysfs device path
|
|
local sysfs_path=""
|
|
local dev_path
|
|
for dev_path in /sys/bus/usb/devices/*/; do
|
|
if [[ -f "${dev_path}idVendor" && -f "${dev_path}idProduct" ]]; then
|
|
local v p
|
|
v=$(cat "${dev_path}idVendor" 2>/dev/null || true)
|
|
p=$(cat "${dev_path}idProduct" 2>/dev/null || true)
|
|
if [[ $v == "$vendor" && $p == "$product" ]]; then
|
|
sysfs_path="$dev_path"
|
|
break
|
|
fi
|
|
fi
|
|
done
|
|
|
|
if [[ -z $sysfs_path ]]; then
|
|
log_warn "Could not find sysfs path for BT adapter."
|
|
return 0
|
|
fi
|
|
|
|
local power_control="${sysfs_path}power/control"
|
|
if [[ -f $power_control ]]; then
|
|
local current
|
|
current=$(cat "$power_control" 2>/dev/null || true)
|
|
if [[ $current != "on" ]]; then
|
|
log_warn "USB autosuspend is enabled ($current) — can cause audio dropouts."
|
|
apply_fix "Disabling USB autosuspend for BT adapter" \
|
|
_disable_usb_autosuspend "$power_control" "$vendor" "$product"
|
|
else
|
|
log_ok "USB autosuspend already disabled."
|
|
fi
|
|
fi
|
|
}
|
|
|
|
_disable_usb_autosuspend() {
|
|
local power_control="$1"
|
|
local vendor="$2"
|
|
local product="$3"
|
|
|
|
# Immediate fix
|
|
echo "on" >"$power_control"
|
|
|
|
# Persistent udev rule. UDEV_RULES_DIR defaults to the real directory and
|
|
# is only overridden by the test suite, which cannot be allowed to write
|
|
# to /etc: lib/tests/run_all.sh runs UN-jailed in ci_mirror.sh and in CI,
|
|
# so a bind mount would protect the coverage run and nothing else.
|
|
local rule_file="${UDEV_RULES_DIR:-/etc/udev/rules.d}/50-bluetooth-no-autosuspend.rules"
|
|
local rule="ACTION==\"add\", SUBSYSTEM==\"usb\", ATTR{idVendor}==\"$vendor\", ATTR{idProduct}==\"$product\", ATTR{power/control}=\"on\""
|
|
|
|
if [[ ! -f $rule_file ]] || ! grep -qF "$vendor" "$rule_file" 2>/dev/null; then
|
|
echo "$rule" >"$rule_file"
|
|
udevadm control --reload-rules 2>/dev/null || true
|
|
log_info "Created persistent udev rule: $rule_file"
|
|
fi
|
|
}
|