mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 21:27:02 +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
4.2 KiB
Bash
Executable File
124 lines
4.2 KiB
Bash
Executable File
#!/bin/bash
|
|
# System upgrade script with automatic apt source hygiene
|
|
# Fixes common warnings/errors before running upgrades.
|
|
# All fixes are idempotent and safe to re-run.
|
|
|
|
set -euo pipefail
|
|
|
|
log() { printf '[upgrade] %s\n' "$*"; }
|
|
|
|
# =====================================================================
|
|
# Fix 1: Duplicate repository — microsoft-edge.list is a copy of
|
|
# google-chrome.list (both point to dl.google.com/linux/chrome)
|
|
# =====================================================================
|
|
fix_duplicate_chrome_edge_repo() {
|
|
local edge="/etc/apt/sources.list.d/microsoft-edge.list"
|
|
|
|
if [[ ! -f $edge ]]; then
|
|
return
|
|
fi
|
|
|
|
# Only act if edge list points to the chrome repo (the known bug)
|
|
if grep -q 'dl.google.com/linux/chrome' "$edge" 2>/dev/null; then
|
|
log "Disabling duplicate microsoft-edge.list (identical to google-chrome.list)"
|
|
mv "$edge" "${edge}.disabled"
|
|
fi
|
|
}
|
|
|
|
# =====================================================================
|
|
# Fix 2: Expired Cloudflare WARP GPG key (expired 2025-12-03)
|
|
# =====================================================================
|
|
fix_cloudflare_key() {
|
|
local keyring="/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg"
|
|
local source_list="/etc/apt/sources.list.d/cloudflare-client.list"
|
|
|
|
if [[ ! -f $source_list ]]; then
|
|
return
|
|
fi
|
|
|
|
# Check if key is expired
|
|
local expired
|
|
expired=$(gpg --no-default-keyring --keyring "$keyring" --list-keys 2>&1 | grep -c 'expired' || true)
|
|
|
|
if [[ ${expired:-0} -gt 0 ]]; then
|
|
log "Refreshing expired Cloudflare WARP GPG key..."
|
|
if curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg |
|
|
gpg --yes --dearmor -o "$keyring" 2>/dev/null; then
|
|
log "Cloudflare key refreshed."
|
|
else
|
|
log "WARNING: Could not refresh Cloudflare key (network issue?). Skipping."
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# =====================================================================
|
|
# Fix 3: WineHQ key in legacy trusted.gpg + repo targets focal not noble
|
|
# =====================================================================
|
|
fix_wine_legacy_key() {
|
|
local legacy_keyring="/etc/apt/trusted.gpg"
|
|
local wine_key_id="D43F640145369C51D786DDEA76F1A20FF987672F"
|
|
local modern_keyring="/usr/share/keyrings/winehq-archive.gpg"
|
|
|
|
# Check if wine key is in the legacy keyring
|
|
if ! gpg --no-default-keyring --keyring "$legacy_keyring" --list-keys "$wine_key_id" >/dev/null 2>&1; then
|
|
return
|
|
fi
|
|
|
|
log "Migrating WineHQ key from legacy trusted.gpg to modern keyring..."
|
|
|
|
# Export key to modern location
|
|
gpg --no-default-keyring --keyring "$legacy_keyring" \
|
|
--export "$wine_key_id" |
|
|
gpg --yes --dearmor -o "$modern_keyring" 2>/dev/null
|
|
|
|
# Remove from legacy keyring (suppress the deprecation warning)
|
|
apt-key del "$wine_key_id" >/dev/null 2>&1 || true
|
|
|
|
# Fix the source file to use signed-by and correct distro codename
|
|
local codename
|
|
codename=$(lsb_release -cs 2>/dev/null || echo "noble")
|
|
|
|
# Find all wine source files
|
|
for src in /etc/apt/sources.list.d/*wine*.list; do
|
|
[[ -f $src ]] || continue
|
|
|
|
# Check if already using signed-by
|
|
if grep -q 'signed-by=' "$src" 2>/dev/null; then
|
|
continue
|
|
fi
|
|
|
|
local old_codename
|
|
old_codename=$(grep -oP 'ubuntu/?\s+\K\w+' "$src" | head -1)
|
|
|
|
log "Updating $src: ${old_codename:-unknown} → $codename, adding signed-by"
|
|
sed -i \
|
|
-e "s|deb https://|deb [arch=amd64 signed-by=$modern_keyring] https://|" \
|
|
-e "s|deb-src https://|# deb-src [arch=amd64 signed-by=$modern_keyring] https://|" \
|
|
-e "s|ubuntu/ ${old_codename}|ubuntu/ ${codename}|g" \
|
|
-e "s|ubuntu ${old_codename}|ubuntu ${codename}|g" \
|
|
"$src"
|
|
done
|
|
|
|
log "WineHQ key migrated and source updated."
|
|
}
|
|
|
|
# =====================================================================
|
|
# Run all fixes, then upgrade
|
|
# =====================================================================
|
|
log "Running apt source hygiene checks..."
|
|
fix_duplicate_chrome_edge_repo
|
|
fix_cloudflare_key
|
|
fix_wine_legacy_key
|
|
log "Apt source checks complete."
|
|
|
|
echo ""
|
|
log "Installing aptitude if needed..."
|
|
apt-get install -y aptitude
|
|
|
|
log "Starting system upgrade..."
|
|
apt-get -y update && apt-get -y upgrade && apt-get -y dist-upgrade
|
|
apt-get -y autoremove
|
|
aptitude -y update && aptitude -y safe-upgrade && aptitude -y dist-upgrade
|
|
|
|
log "Upgrade complete."
|