mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-15 02:30:55 +01:00
Krzysztof kuhy Rudnicki
309f4c8d42
Five live mechanisms were silently pointing at paths that no longer exist.
None of them announced it; each degraded to a log line or a missing file.
- hosts-file-monitor.service is ACTIVE and watches /etc/hosts for tampering,
but its embedded installer path was the pre-flatten scripts/ one. It logged
"Hosts install script not found" 37 times: it detected tampering it could
not repair.
- dns-blocklist-refresh.service (enabled, next run 00:01) named a deleted
single_use/features/ path, as did media-organizer.service under utils/.
- setup_periodic_system.sh read all TEN of its templates from
periodic_background/system-maintenance/, which has held nothing but
untracked .pyc and .coverage residue since system-maintenance was
extracted. Every install of a service, timer or script was reading a file
that was not there.
- /etc/sudoers.d/hosts-install-no-passwd granted NOPASSWD on the old hosts
installer path.
Running the fixed dns unit then caught a bug the static checks missed: under
systemd there is no SUDO_USER and `id -un` is root, so the new resolver
returned /root/hosts-blocker and the service died with "Feed generator not
found". extracted_repo_home() now handles the bare-root case by falling back
to the owner of the lib file itself. Verified across all four invocation
modes: as the user, via sudo, as root with SUDO_USER unset, and with an
explicit *_DIR override.
The service now reports "Feed refreshed and dnsmasq reloaded (189038 lines)".
/etc/hosts is untouched throughout -- still 176888 lines, still chattr +i,
still bind-mounted by its guard.
Live artifacts were patched via validated temp files, never in-place: the
sudoers drop-in was checked with `visudo -cf` before install, and every
original is backed up under /var/tmp/*.pre-{extract,fix}.
Stale live references: 8 -> 2. The 2 that remain name digital_wellbeing
paths and can only be fixed when that unit is extracted.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
77 lines
3.1 KiB
Bash
Executable File
77 lines
3.1 KiB
Bash
Executable File
#!/bin/bash
|
|
# Resolve the on-disk location of repos that were EXTRACTED out of this
|
|
# monorepo, so callers that still orchestrate them can find them.
|
|
#
|
|
# Why this exists: when screen_locker was extracted, check_and_enable_services
|
|
# kept pointing at python_pkg/screen_locker/, which had stopped existing. The
|
|
# result was a red "error" for a service that was installed and enabled the
|
|
# whole time, while its "fix" silently did nothing. A missing extracted repo
|
|
# must be LOUD, never a silent skip.
|
|
#
|
|
# $HOME is wrong here: several callers re-exec themselves via sudo, where
|
|
# $HOME is /root. Resolve the invoking user's home instead, the same way
|
|
# check_and_enable_services.sh already does for screen-locker.
|
|
|
|
# Absolute path to the human user's home directory -- the extracted repos are
|
|
# cloned there, never into /root.
|
|
#
|
|
# Three cases, and all three happen in practice:
|
|
# 1. run directly by the user -> $USER
|
|
# 2. run via sudo -> SUDO_USER ($HOME is /root here)
|
|
# 3. run by systemd as root -> NEITHER is set and `id -un` is "root".
|
|
# Falling back to root's home yields /root/<repo>, which never exists.
|
|
# dns-blocklist-refresh.service hit exactly this and died with
|
|
# "Feed generator not found: /root/hosts-blocker/...".
|
|
#
|
|
# For case 3 fall back to REPO_OWNER_USER, which defaults to the owner of this
|
|
# very file -- the checkout the caller is running from is itself the best
|
|
# evidence of whose home the sibling repos are in.
|
|
extracted_repo_home() {
|
|
local real_user real_home
|
|
real_user="${SUDO_USER:-${USER:-$(id -un)}}"
|
|
if [[ $real_user == "root" ]]; then
|
|
real_user="${REPO_OWNER_USER:-$(stat -c %U "${BASH_SOURCE[0]}" 2>/dev/null)}"
|
|
[[ -n $real_user && $real_user != "root" ]] || real_user="root"
|
|
fi
|
|
real_home="$(getent passwd "$real_user" 2>/dev/null | cut -d: -f6)"
|
|
[[ -n $real_home ]] || real_home="/home/$real_user"
|
|
printf '%s' "$real_home"
|
|
}
|
|
|
|
# extracted_repo_dir <repo-name>
|
|
# Prints the expected checkout path. An override env var (e.g.
|
|
# HOSTS_BLOCKER_DIR for hosts-blocker) wins, so a non-standard checkout does
|
|
# not require editing these scripts.
|
|
extracted_repo_dir() {
|
|
local name="$1" var override
|
|
var="$(printf '%s' "$name" | tr '[:lower:]-' '[:upper:]_')_DIR"
|
|
override="${!var:-}"
|
|
if [[ -n $override ]]; then
|
|
printf '%s' "$override"
|
|
return 0
|
|
fi
|
|
printf '%s/%s' "$(extracted_repo_home)" "$name"
|
|
}
|
|
|
|
# require_extracted_repo <repo-name> [what-needs-it]
|
|
# Prints the directory on success. On failure, explains how to get it and
|
|
# returns 1 -- callers decide whether that is fatal, but none of them may
|
|
# treat it as "nothing to do".
|
|
require_extracted_repo() {
|
|
local name="$1" what="${2:-this script}" dir
|
|
dir="$(extracted_repo_dir "$name")"
|
|
if [[ ! -d $dir ]]; then
|
|
printf '\n' >&2
|
|
printf 'ERROR: %s needs the extracted "%s" repo, which is not checked out.\n' \
|
|
"$what" "$name" >&2
|
|
printf ' expected at: %s\n' "$dir" >&2
|
|
printf ' clone it: git clone https://github.com/kuhyx/%s %s\n' \
|
|
"$name" "$dir" >&2
|
|
printf ' or set: %s_DIR=/path/to/%s\n' \
|
|
"$(printf '%s' "$name" | tr '[:lower:]-' '[:upper:]_')" "$name" >&2
|
|
printf '\n' >&2
|
|
return 1
|
|
fi
|
|
printf '%s' "$dir"
|
|
}
|