mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 14:07:49 +01:00
Krzysztof kuhy Rudnicki
fe8629e104
github.com/kuhyx/android-guardian, cloned to ~/android-guardian
periodic_background/utils/ held two unrelated things: the Magisk module
and heavy_job_lock.sh. Only the module was a unit, so the directory is
split rather than moved.
heavy_job_lock.sh goes to digital_wellbeing/, NOT to ~/utils. Measured
rather than assumed: of its consumers only install_pacman_wrapper.sh
reads the repo copy, while pacman_wrapper.sh, makepkg_capped.sh and
meta/scripts/run_with_heavy_lock.sh all read the installed
/usr/local/bin copy. A library belongs with whoever installs it, and
exporting it would have added a cross-repo edge for one caller.
Fixed a bug that predates the extraction: update_android_hosts.sh set
GUARDIAN_MODULE_DIR to "$SCRIPT_DIR/android_guardian", a sibling that
never existed at that path -- packaging could not have worked from this
checkout at all. It now reads ${ANDROID_GUARDIAN_DIR:-~/android-guardian}
and require_guardian_module() gates build_module(), the single funnel
every packaging path goes through, so a missing checkout names the clone
command instead of failing inside a cp four helpers deep.
Verified both directions: with no checkout the guard fires with
instructions; with one, the module builds -- 182331 blocked domains, a
1.1 MB zip. The subsequent adb push failed on device-side storage, which
this commit does not touch.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
49 lines
3.5 KiB
JSON
49 lines
3.5 KiB
JSON
{
|
|
"intent": "Extract the android_guardian Magisk module into its own public repo, settle where heavy_job_lock.sh belongs, and fix a pre-existing broken path in the packaging script rather than carrying it forward.",
|
|
"scope": [
|
|
"periodic_background/utils/android_guardian/ (5 files) -> github.com/kuhyx/android-guardian as module/, cloned to ~/android-guardian",
|
|
"Its two test suites in linux_configuration/tests/ moved with it",
|
|
"heavy_job_lock.sh moved to digital_wellbeing/, its only installer - NOT to ~/utils",
|
|
"update_android_hosts.sh + lib/android_module.sh repointed and guarded",
|
|
"shell-tests.yml, shell-coverage-allowlist.txt cleaned",
|
|
"periodic_background/utils/ is now empty and removed"
|
|
],
|
|
"changes": [
|
|
"Extracted the module and both suites in one filter-repo pass (4 commits), renaming the module directory to module/ and fixing the test paths that named the old monorepo location.",
|
|
"Moved heavy_job_lock.sh into digital_wellbeing/ instead of ~/utils. Measured: of its consumers, only install_pacman_wrapper.sh reads the repo copy; pacman_wrapper.sh, makepkg_capped.sh and meta/scripts/run_with_heavy_lock.sh all read the installed /usr/local/bin path. It belongs with its installer.",
|
|
"Fixed a pre-existing bug: update_android_hosts.sh set GUARDIAN_MODULE_DIR to $SCRIPT_DIR/android_guardian, a sibling directory that never existed at that path, so packaging could not have worked from this checkout. It now reads ${ANDROID_GUARDIAN_DIR:-$HOME/android-guardian}/module.",
|
|
"Added require_guardian_module() and called it from build_module(), the single funnel every packaging path goes through, so a missing checkout fails with an actionable message instead of a bare 'cp: cannot stat' four helpers deep."
|
|
],
|
|
"verification": [
|
|
{
|
|
"command": "bash tests/*.sh (extracted repo)",
|
|
"result": "pass",
|
|
"evidence": "Both suites pass after the path rewrite; shellcheck exits 0 over every script with .shellcheckrc carried across."
|
|
},
|
|
{
|
|
"command": "ANDROID_GUARDIAN_DIR=/nonexistent bash update_android_hosts.sh install",
|
|
"result": "pass",
|
|
"evidence": "Stops at the guard with the clone command and the override variable named, rather than failing inside cp."
|
|
},
|
|
{
|
|
"command": "bash update_android_hosts.sh install (with ~/android-guardian cloned)",
|
|
"result": "pass",
|
|
"evidence": "Module built: 182331 blocked domains, a 1149321-byte zip. It then failed at `adb push` with 'remote couldn't create file' - a device-side storage condition, not a path problem, and the build half is what this change touches."
|
|
},
|
|
{
|
|
"command": "shellcheck on both edited scripts; check_shell_coverage.sh --all",
|
|
"result": "pass",
|
|
"evidence": "Both clean, exit 0."
|
|
}
|
|
],
|
|
"risks": [
|
|
"The adb push step was not verified end-to-end: the device refused to create the file on /sdcard. That path is unchanged by this commit, but it does mean the full install flow is unproven today.",
|
|
"update_android_hosts.sh now depends on a sibling checkout. It fails loudly with instructions rather than silently, which is the tradeoff taken.",
|
|
"heavy_job_lock.sh now sits inside digital_wellbeing, so it will move again when that subsystem is extracted; install_pacman_wrapper.sh's relative path was updated to match and stays correct through that move."
|
|
],
|
|
"rollback": [
|
|
"git revert to restore the module, both tests and heavy_job_lock.sh's old location.",
|
|
"Re-run check_shell_coverage.sh --all and the two suites to confirm the restored state."
|
|
]
|
|
}
|