mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 18:07:06 +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
154 lines
4.8 KiB
Bash
Executable File
154 lines
4.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Helpers sourced by the entry script.
|
|
|
|
# Generic function to remove installed packages matching a filter
|
|
# Args: check_function label_prefix
|
|
function remove_installed_packages_matching() {
|
|
local check_function="$1"
|
|
local label="$2"
|
|
|
|
mapfile -t installed_names < <("$PACMAN_BIN" -Qq 2>/dev/null)
|
|
local to_remove=()
|
|
for name in "${installed_names[@]}"; do
|
|
if "$check_function" "$name"; then
|
|
to_remove+=("$name")
|
|
fi
|
|
done
|
|
|
|
if [[ ${#to_remove[@]} -eq 0 ]]; then
|
|
return 0
|
|
fi
|
|
|
|
echo -e "${YELLOW}${label} cleanup:${NC} Removing packages: ${BOLD}${to_remove[*]}${NC}" >&2
|
|
"$PACMAN_BIN" -Rns --noconfirm "${to_remove[@]}"
|
|
local rc=$?
|
|
if [[ $rc -ne 0 ]]; then
|
|
echo -e "${RED}${label} cleanup removal failed with exit code ${rc}.${NC}" >&2
|
|
else
|
|
echo -e "${GREEN}${label} cleanup removal completed for: ${to_remove[*]}${NC}" >&2
|
|
fi
|
|
return $rc
|
|
}
|
|
|
|
# Cleanup: remove any installed blocked packages
|
|
function remove_installed_blocked_packages() {
|
|
remove_installed_packages_matching is_blocked_package_name "Policy"
|
|
}
|
|
|
|
# Cleanup: remove any installed greylisted packages
|
|
function remove_installed_greylisted_packages() {
|
|
remove_installed_packages_matching is_greylisted_package_name "Greylist"
|
|
}
|
|
|
|
# Auto-install LeechBlock if a browser is detected
|
|
auto_install_leechblock() {
|
|
# Only check after install operations
|
|
if [[ -z ${1:-} ]] || [[ $1 != "-S"* && $1 != "-U"* ]]; then
|
|
return 0
|
|
fi
|
|
|
|
# List of browser packages to check for
|
|
local browsers=("firefox" "librewolf" "chromium" "brave" "vivaldi" "google-chrome" "ungoogled-chromium")
|
|
local browser_found=0
|
|
|
|
for browser in "${browsers[@]}"; do
|
|
if "$PACMAN_BIN" -Qq "$browser" 2>/dev/null; then
|
|
browser_found=1
|
|
break
|
|
fi
|
|
done
|
|
|
|
if [[ $browser_found -eq 0 ]]; then
|
|
return 0
|
|
fi
|
|
|
|
# Find the LeechBlock installer
|
|
local script_dir
|
|
script_dir="$(dirname "$(readlink -f "$0")")"
|
|
local leechblock_installer=""
|
|
|
|
if [[ -f "/usr/local/share/digital_wellbeing/install_leechblock.sh" ]]; then
|
|
leechblock_installer="/usr/local/share/digital_wellbeing/install_leechblock.sh"
|
|
elif [[ -f "$script_dir/../install_leechblock.sh" ]]; then
|
|
leechblock_installer="$script_dir/../install_leechblock.sh"
|
|
fi
|
|
|
|
if [[ -z $leechblock_installer ]]; then
|
|
echo -e "${YELLOW}Browser detected but LeechBlock installer not found.${NC}" >&2
|
|
return 0
|
|
fi
|
|
|
|
# Check if LeechBlock is already installed (by looking for the extension directory)
|
|
if [[ -d "$HOME/.local/share/leechblockng" ]]; then
|
|
return 0
|
|
fi
|
|
|
|
echo -e "${CYAN}Browser detected. Installing LeechBlock extension for website blocking...${NC}" >&2
|
|
|
|
# Run the LeechBlock installer (as current user, not root)
|
|
if [[ $EUID -eq 0 && -n "${SUDO_USER:-}" ]]; then
|
|
sudo -u "$SUDO_USER" bash "$leechblock_installer" --install-firefox 2>&1 || {
|
|
echo -e "${YELLOW}LeechBlock auto-install failed. Please install manually:${NC}" >&2
|
|
echo -e "${YELLOW} $leechblock_installer${NC}" >&2
|
|
}
|
|
else
|
|
bash "$leechblock_installer" --install-firefox 2>&1 || {
|
|
echo -e "${YELLOW}LeechBlock auto-install failed. Please install manually:${NC}" >&2
|
|
echo -e "${YELLOW} $leechblock_installer${NC}" >&2
|
|
}
|
|
fi
|
|
}
|
|
|
|
# If VirtualBox is installed, automatically remove all VMs
|
|
auto_remove_virtualbox_vms() {
|
|
# Check if VBoxManage is available
|
|
if ! command -v VBoxManage &>/dev/null; then
|
|
return 0
|
|
fi
|
|
|
|
# Determine real user (wrapper may run as root via sudo)
|
|
local real_user="${SUDO_USER:-$USER}"
|
|
|
|
# Get list of registered VMs (run as real user since VMs are per-user)
|
|
local vm_list
|
|
vm_list=$(sudo -u "$real_user" VBoxManage list vms 2>/dev/null) || return 0
|
|
|
|
if [[ -z $vm_list ]]; then
|
|
return 0
|
|
fi
|
|
|
|
echo -e "${RED}═══════════════════════════════════════════════════════${NC}" >&2
|
|
echo -e "${RED} VIRTUALBOX VMs DETECTED - AUTO-REMOVING ${NC}" >&2
|
|
echo -e "${RED}═══════════════════════════════════════════════════════${NC}" >&2
|
|
|
|
local vm_name
|
|
local success=0
|
|
local failed=0
|
|
|
|
while IFS= read -r line; do
|
|
# VBoxManage list vms output format: "VM Name" {uuid}
|
|
vm_name="${line#\"}"
|
|
vm_name="${vm_name%%\"*}"
|
|
if [[ -z $vm_name ]]; then
|
|
continue
|
|
fi
|
|
|
|
echo -e "${YELLOW}Removing VM: ${vm_name}${NC}" >&2
|
|
|
|
# Power off the VM if it's running
|
|
sudo -u "$real_user" VBoxManage controlvm "$vm_name" poweroff 2>/dev/null || true
|
|
sleep 1
|
|
|
|
# Unregister and delete all files
|
|
if sudo -u "$real_user" VBoxManage unregistervm "$vm_name" --delete 2>/dev/null; then
|
|
echo -e "${GREEN} Removed: ${vm_name}${NC}" >&2
|
|
((++success))
|
|
else
|
|
echo -e "${RED} Failed to remove: ${vm_name}${NC}" >&2
|
|
((++failed))
|
|
fi
|
|
done <<<"$vm_list"
|
|
|
|
echo -e "${CYAN}VM removal complete: ${success} removed, ${failed} failed.${NC}" >&2
|
|
}
|