mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 14:27:49 +01:00
Krzysztof kuhy Rudnicki
f72455662c
linux_configuration/periodic_background/hosts/ is now github.com/kuhyx/hosts-blocker, cloned at ~/hosts-blocker. Clears 5 of the 46 directory-depth violations; the remaining 41 are all digital_wellbeing, so --warn stays on the depth hook until that unit moves too. History was filtered across ALL FOUR paths the unit has lived at (hosts/, linux_configuration/hosts/, linux_configuration/scripts/periodic_background/ hosts/, and the current one). Filtering on the current path alone would have preserved 1 commit out of 51 -- the flatten moved it recently, so a naive single --path silently truncates the history to the flatten commit and still looks fine in `git log | head`. No source line changed: all 15 files are byte-identical to the copies removed here. install.sh already resolved its lib/ via BASH_SOURCE. The six callers now resolve the checkout through a new shared helper, linux_configuration/lib/extracted_repos.sh, which reads the invoking user's home from SUDO_USER's passwd entry rather than $HOME -- several of these scripts re-exec under sudo, where $HOME is /root. A missing checkout fails loudly with a clone instruction; it is never a silent skip, which is the failure mode that left screen-locker's self-repair dead for five months after the 2026-05-15 reorg. The live blocker is untouched: /etc/hosts keeps its chattr +i, and the guards load their plugins from /usr/local/share/guard-lib-plugins/ (byte-identical by md5), not from a repo path. Verified: 25 tests pass from ~/hosts-blocker; shellcheck clean on the helper and all six callers; sudo resolution prints /home/kuhy/hosts-blocker; test_setup_dns_blocker.sh passes; report_live_state.sh --check is byte-identical before and after, so no new stale references. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
60 lines
2.2 KiB
Bash
Executable File
60 lines
2.2 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 invoking (non-root) user's home directory.
|
|
extracted_repo_home() {
|
|
local real_user real_home
|
|
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"
|
|
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"
|
|
}
|