mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-14 20:40:48 +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
124 lines
3.6 KiB
Bash
Executable File
124 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
# Journal, NetworkManager and media-organizer performance fixes.
|
|
#
|
|
# Sourced by fix_arch_performance.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 helper functions and variables defined above the source line.
|
|
|
|
# ===================================================================
|
|
# Fix 3: Journal vacuum + permanent size cap
|
|
# ===================================================================
|
|
fix_journal() {
|
|
local usage_line
|
|
usage_line=$(journalctl --disk-usage 2>/dev/null || true)
|
|
|
|
local needs_vacuum=false
|
|
# Optional space before the unit: journalctl prints "305.5M in the file
|
|
# system", with no separator, so requiring one made this dead code.
|
|
if [[ $usage_line =~ ([0-9]+\.?[0-9]*)\ ?G ]]; then
|
|
needs_vacuum=true
|
|
fi
|
|
|
|
if [[ $needs_vacuum == "true" ]]; then
|
|
journalctl --vacuum-size=300M
|
|
else
|
|
log_ok "Journal is already under 1GiB."
|
|
fi
|
|
|
|
# Create permanent size cap via drop-in
|
|
local dropin_dir="${JOURNALD_CONF_DIR:-/etc/systemd/journald.conf.d}"
|
|
local dropin_file="$dropin_dir/size-limit.conf"
|
|
|
|
if [[ -f $dropin_file ]] && grep -q 'SystemMaxUse=300M' "$dropin_file"; then
|
|
log_ok "Journal size cap already configured."
|
|
else
|
|
mkdir -p "$dropin_dir"
|
|
cat >"$dropin_file" <<'JOURNALEOF'
|
|
[Journal]
|
|
SystemMaxUse=300M
|
|
JOURNALEOF
|
|
systemctl restart systemd-journald
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 4: Disable NetworkManager-wait-online
|
|
# ===================================================================
|
|
fix_nm_wait_online() {
|
|
if ! systemctl is-enabled NetworkManager-wait-online.service >/dev/null 2>&1; then
|
|
log_ok "NetworkManager-wait-online is already disabled — skipping."
|
|
return 0
|
|
fi
|
|
|
|
systemctl disable NetworkManager-wait-online.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 5: media-organizer.service
|
|
# ===================================================================
|
|
fix_media_organizer() {
|
|
local service_file="${SYSTEMD_UNIT_DIR:-/etc/systemd/system}/media-organizer.service"
|
|
|
|
# Find the organize_downloads.sh script
|
|
local script_path=""
|
|
local candidates=(
|
|
"${ORGANIZE_SCRIPT_CANDIDATES:-/home/kuhy/testsAndMisc/linux_configuration/utils/organize_downloads.sh}"
|
|
"/home/kuhy/linux-configuration/scripts/utils/organize_downloads.sh"
|
|
)
|
|
for candidate in "${candidates[@]}"; do
|
|
if [[ -f $candidate ]]; then
|
|
script_path="$candidate"
|
|
break
|
|
fi
|
|
done
|
|
|
|
if [[ -z $script_path ]]; then
|
|
log_warn "organize_downloads.sh not found — skipping media-organizer fix."
|
|
return 0
|
|
fi
|
|
|
|
local target_user="${SUDO_USER:-kuhy}"
|
|
|
|
# Check if already correct
|
|
if [[ -f $service_file ]]; then
|
|
if grep -q "User=$target_user" "$service_file" &&
|
|
grep -q "ExecStart=$script_path" "$service_file"; then
|
|
log_ok "media-organizer.service is already correctly configured — skipping."
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
systemctl stop media-organizer.service 2>/dev/null || true
|
|
|
|
cat >"$service_file" <<EOF
|
|
[Unit]
|
|
Description=Media File Organizer
|
|
After=graphical-session.target
|
|
Wants=graphical-session.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
User=$target_user
|
|
Group=$target_user
|
|
ExecStart=$script_path
|
|
StandardOutput=journal
|
|
StandardError=journal
|
|
RemainAfterExit=no
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
systemctl daemon-reload
|
|
systemctl reset-failed media-organizer.service 2>/dev/null || true
|
|
systemctl enable media-organizer.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Apply all fixes
|
|
# ===================================================================
|