mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-19 17:24:22 +01:00
1225 lines down to 202, with the 21 functions moved into eight sourced libraries grouped by subject. The entry script now holds only the configuration, the argument parsing and the order the checks run in. check_hosts was the one function that could not move verbatim: at 260 lines it would have stayed over the cap on its own, so its repair half is now hosts_fix_nsswitch / hosts_fix_resolved / hosts_repair_all in services_hosts_fix.sh. Repair order is preserved (resolver config, then the hosts file, then the guard-lib migration), and hosts_repair_all returns non-zero under --dry-run so a dry run can no longer promote a status to "ok" on the strength of repairs that never happened. SERVICE_STATUS was a write-only global across five libs, which is a real SC2034 rather than noise: the pre-commit hook runs shellcheck with no -x and genuinely cannot see the one reader. It now goes through set_service_status / get_service_status, which also rejects a duplicate write — each check owns exactly one summary row, so a second write means two checks are fighting over it. No suppression was added anywhere. Proof the behaviour is unchanged: `--status --dry-run` run as root against this machine is byte-identical to the same command from a worktree at the pre-split revision, modulo the Date: line. verify_shell_split.sh reports check_hosts as the single expected difference; the other 20 functions hash identically. 72 assertions across three test files pass, with 100% line coverage on services_common.sh (54/54) and services_report.sh (27/27). services_units.sh measures 84.51% (60/71). The 11 uncovered lines are the else-branches of [[ -f /etc/systemd/system/*.service ]] and [[ -f /usr/local/bin/*.sh ]] probes — absolute root-owned paths that exist on this machine and that no PATH shim can redirect. Reaching them needs a root-prefix rewrite of live enforcement logic, which is not a line-count fix and would forfeit the verbatim-move proof for everything else. Found while testing, deliberately NOT fixed here: in all three unit checks the is-active branch assigns status="warning" unconditionally, overwriting the status="error" the is-enabled branch set just above it. A timer that is both disabled and inactive therefore never gets repaired, because report_and_fix only repairs on "error". It is identical in the pre-split file, so this split neither caused nor hides it. The tests pin the current behaviour and name it; fixing it changes enforcement and earns its own commit. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F3PzGc75gBcdxP3PkHXGcV
184 lines
6.9 KiB
Bash
Executable File
184 lines
6.9 KiB
Bash
Executable File
#!/bin/bash
|
|
# Script to check and enable all digital wellbeing services
|
|
# Checks: pacman wrapper, midnight shutdown, startup monitor, periodic systems, hosts and hosts guard
|
|
#
|
|
# Usage:
|
|
# sudo ./check_and_enable_services.sh [options]
|
|
# Options:
|
|
# --dry-run Show what would be done without making changes
|
|
# --status Only show status, don't enable anything
|
|
# -h|--help Show help
|
|
|
|
set -euo pipefail
|
|
|
|
# Every check lives in a lib beside this file; this script keeps only the
|
|
# configuration, argument parsing and the order the checks run in.
|
|
LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/lib"
|
|
# shellcheck source=lib/services_common.sh
|
|
. "$LIB_DIR/services_common.sh"
|
|
# shellcheck source=lib/services_wrappers.sh
|
|
. "$LIB_DIR/services_wrappers.sh"
|
|
# shellcheck source=lib/services_units.sh
|
|
. "$LIB_DIR/services_units.sh"
|
|
# shellcheck source=lib/services_hosts.sh
|
|
. "$LIB_DIR/services_hosts.sh"
|
|
# shellcheck source=lib/services_hosts_fix.sh
|
|
. "$LIB_DIR/services_hosts_fix.sh"
|
|
# shellcheck source=lib/services_apps.sh
|
|
. "$LIB_DIR/services_apps.sh"
|
|
# shellcheck source=lib/services_browser.sh
|
|
. "$LIB_DIR/services_browser.sh"
|
|
# shellcheck source=lib/services_report.sh
|
|
. "$LIB_DIR/services_report.sh"
|
|
|
|
######################################################################
|
|
# Configuration
|
|
######################################################################
|
|
DRY_RUN=0
|
|
STATUS_ONLY=0
|
|
|
|
# Colors
|
|
RED=$'\033[0;31m'
|
|
GREEN=$'\033[0;32m'
|
|
YELLOW=$'\033[0;33m'
|
|
BLUE=$'\033[0;34m'
|
|
CYAN=$'\033[0;36m'
|
|
NC=$'\033[0m' # No Color
|
|
|
|
# Get script and config directories
|
|
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
|
|
CONFIG_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
|
|
|
|
# Script paths
|
|
PACMAN_WRAPPER_INSTALL="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/pacman/install_pacman_wrapper.sh"
|
|
MAKEPKG_WRAPPER_INSTALL="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/pacman/install_makepkg_wrapper.sh"
|
|
# Drift manifests written by the two installers above (see deployment_drift).
|
|
PACMAN_WRAPPER_MANIFEST="/var/lib/pacman-wrapper/source.sha256"
|
|
MAKEPKG_WRAPPER_MANIFEST="/var/lib/pacman-wrapper/makepkg-source.sha256"
|
|
MIDNIGHT_SHUTDOWN_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/setup_midnight_shutdown.sh"
|
|
STARTUP_MONITOR_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/setup_pc_startup_monitor.sh"
|
|
PERIODIC_SYSTEM_SCRIPT="$CONFIG_DIR/scripts/periodic_background/setup_periodic_system.sh"
|
|
HOSTS_INSTALL_SCRIPT="$CONFIG_DIR/scripts/periodic_background/hosts/install.sh"
|
|
GUARD_LIB_MIGRATE_SCRIPT="$CONFIG_DIR/scripts/single_use/fixes/migrate_hosts_guard_to_guard_lib.sh"
|
|
COMPULSIVE_BLOCK_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/block_compulsive_opening.sh"
|
|
LEECHBLOCK_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/install_leechblock.sh"
|
|
REMOVE_GUEST_MODE_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/remove_guest_mode.sh"
|
|
VBOX_HOSTS_SCRIPT="$CONFIG_DIR/scripts/periodic_background/digital_wellbeing/virtualbox/enforce_vbox_hosts.sh"
|
|
# screen-locker was EXTRACTED out of this monorepo into its own repo
|
|
# (github.com/kuhyx/screen-locker, checked out at ~/screen-locker), so these
|
|
# paths deliberately live outside testsAndMisc. They used to point at
|
|
# python_pkg/screen_locker/, which stopped existing at extraction time — the
|
|
# result was check_workout_locker reporting a red "error" for a service that was
|
|
# installed and enabled the whole time, while its "fix" silently did nothing.
|
|
# Resolve the invoking user's home: this script re-execs itself via sudo, so
|
|
# $HOME would be /root here.
|
|
REAL_USER="${SUDO_USER:-${USER:-$(id -un)}}"
|
|
REAL_HOME="$(getent passwd "$REAL_USER" 2>/dev/null | cut -d: -f6)"
|
|
[[ -n $REAL_HOME ]] || REAL_HOME="/home/$REAL_USER"
|
|
WORKOUT_LOCKER_REPO="$REAL_HOME/screen-locker"
|
|
WORKOUT_LOCKER_INSTALL_SCRIPT="$WORKOUT_LOCKER_REPO/install_systemd.sh"
|
|
WORKOUT_LOCKER_SCRIPT="$WORKOUT_LOCKER_REPO/screen_locker/screen_lock.py"
|
|
|
|
# A MISSING repair script means THIS TOOL is broken: it silently stops repairing
|
|
# the thing it exists to repair. That is exactly how the 2026-05-15 reorg left a
|
|
# stale $CONFIG_DIR/hosts path here — check_hosts detected the disabled guards
|
|
# every run, failed to find setup_hosts_guard.sh, printed one line among a
|
|
# hundred, and still exited 0. Five months of dead self-repair, zero symptoms.
|
|
# So: record it, log at journal ERROR priority, and exit non-zero with a banner.
|
|
declare -a MISSING_SCRIPTS=()
|
|
|
|
######################################################################
|
|
# Parse arguments
|
|
######################################################################
|
|
ORIGINAL_ARGS=("$@")
|
|
while [[ $# -gt 0 ]]; do
|
|
case "$1" in
|
|
--dry-run)
|
|
DRY_RUN=1
|
|
shift
|
|
;;
|
|
--status)
|
|
STATUS_ONLY=1
|
|
shift
|
|
;;
|
|
-h | --help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
*)
|
|
err "Unknown option: $1"
|
|
usage
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
require_root "${ORIGINAL_ARGS[@]}"
|
|
|
|
######################################################################
|
|
# Status tracking
|
|
######################################################################
|
|
declare -A SERVICE_STATUS
|
|
ISSUES_FOUND=0
|
|
FIXES_APPLIED=0
|
|
|
|
######################################################################
|
|
# Check functions
|
|
######################################################################
|
|
|
|
######################################################################
|
|
# Main
|
|
######################################################################
|
|
main() {
|
|
echo ""
|
|
echo "Digital Wellbeing Services Status Check"
|
|
echo "========================================"
|
|
echo "Date: $(date)"
|
|
echo "User: ${SUDO_USER:-$USER}"
|
|
if [[ $DRY_RUN -eq 1 ]]; then
|
|
echo "Mode: DRY RUN (no changes will be made)"
|
|
elif [[ $STATUS_ONLY -eq 1 ]]; then
|
|
echo "Mode: STATUS ONLY (no changes will be made)"
|
|
else
|
|
echo "Mode: CHECK AND FIX"
|
|
fi
|
|
|
|
check_pacman_wrapper
|
|
check_makepkg_wrapper
|
|
check_midnight_shutdown
|
|
check_startup_monitor
|
|
check_periodic_systems
|
|
check_hosts
|
|
check_compulsive_blocker
|
|
check_leechblock
|
|
check_guest_mode_removal
|
|
check_vbox_hosts
|
|
check_workout_locker
|
|
|
|
print_summary
|
|
}
|
|
|
|
main
|
|
|
|
######################################################################
|
|
# A missing repair script means this tool cannot do the one job it exists for.
|
|
# Exiting 0 there is indistinguishable from "everything is fine" — which is how
|
|
# it hid dead hosts self-repair for five months. Make it impossible to miss.
|
|
######################################################################
|
|
if [[ ${#MISSING_SCRIPTS[@]} -gt 0 ]]; then
|
|
printf '\n%s' "$RED"
|
|
printf '=%.0s' {1..74}
|
|
printf "\n SELF-REPAIR IS BROKEN — %d repair script(s) MISSING\n" "${#MISSING_SCRIPTS[@]}"
|
|
printf '=%.0s' {1..74}
|
|
printf '%s\n' "$NC"
|
|
for missing in "${MISSING_SCRIPTS[@]}"; do
|
|
err "$missing"
|
|
done
|
|
printf '%sThe services above are NOT being repaired — this tool found the\n' "$RED"
|
|
printf 'problem and then could not run the fix. Correct these paths first.%s\n' "$NC"
|
|
printf '%sAlso logged at error priority: journalctl -p err -t check-and-enable-services%s\n\n' "$CYAN" "$NC"
|
|
exit 2
|
|
fi
|
|
|
|
exit 0
|