mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 21:27:02 +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
161 lines
4.6 KiB
Bash
Executable File
161 lines
4.6 KiB
Bash
Executable File
#!/bin/bash
|
|
# update_android_hosts.sh - Deploy Android Guardian (hosts blocking + app blocker)
|
|
# This creates a persistent protection that can ONLY be controlled via ADB
|
|
set -euo pipefail
|
|
|
|
# Source common library
|
|
SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
|
|
# shellcheck source=../lib/common.sh
|
|
source "$SCRIPT_DIR/../lib/common.sh"
|
|
# shellcheck source=../lib/android.sh
|
|
source "$SCRIPT_DIR/../lib/android.sh"
|
|
|
|
# The module moved to github.com/kuhyx/android-guardian. This pointed at a
|
|
# sibling directory that never existed here even before the extraction, so the
|
|
# script could not have packaged a module from this path; prefer a checkout and
|
|
# say so loudly rather than failing later inside zip.
|
|
GUARDIAN_MODULE_DIR="${ANDROID_GUARDIAN_DIR:-$HOME/android-guardian}/module"
|
|
GUARDIAN_DATA_DIR="/data/adb/android_guardian"
|
|
MODULE_DEST="/data/adb/modules/android_guardian"
|
|
|
|
# Fail here, not four helpers deep inside a cp. Every packaging step below
|
|
# reads GUARDIAN_MODULE_DIR unguarded, so an absent checkout would otherwise
|
|
# surface as a bare "cp: cannot stat".
|
|
require_guardian_module() {
|
|
[[ -f "$GUARDIAN_MODULE_DIR/module.prop" ]] && return 0
|
|
die "android-guardian module not found at ${GUARDIAN_MODULE_DIR}.
|
|
It lives in its own repo now:
|
|
git clone https://github.com/kuhyx/android-guardian ~/android-guardian
|
|
Or point this script elsewhere with ANDROID_GUARDIAN_DIR."
|
|
}
|
|
|
|
# Ensure android-tools (adb) is installed
|
|
ensure_adb_installed() {
|
|
if command -v adb &>/dev/null; then
|
|
return 0
|
|
fi
|
|
|
|
log "adb not found, installing android-tools..."
|
|
|
|
if command -v pacman &>/dev/null; then
|
|
sudo pacman -S --noconfirm android-tools || die "Failed to install android-tools"
|
|
elif command -v apt-get &>/dev/null; then
|
|
# `apt-get update && apt-get install ... || die` would also die when the
|
|
# update succeeded but the install failed to REPORT - and, worse, skipped
|
|
# die entirely if update itself failed. Check each step.
|
|
sudo apt-get update || die "Failed to update apt package lists"
|
|
sudo apt-get install -y adb || die "Failed to install adb"
|
|
elif command -v dnf &>/dev/null; then
|
|
sudo dnf install -y android-tools || die "Failed to install android-tools"
|
|
else
|
|
die "adb not found and could not determine package manager. Please install android-tools manually."
|
|
fi
|
|
|
|
# Verify installation
|
|
if ! command -v adb &>/dev/null; then
|
|
die "adb installation failed"
|
|
fi
|
|
|
|
log "android-tools installed successfully"
|
|
}
|
|
|
|
show_usage() {
|
|
cat <<EOF
|
|
Usage: $(basename "$0") [COMMAND]
|
|
|
|
Commands:
|
|
install Install/update Android Guardian module (default)
|
|
status Show guardian status
|
|
disable Temporarily disable guardian (requires ADB)
|
|
enable Re-enable guardian (requires ADB)
|
|
uninstall Remove guardian module (requires ADB + disable first)
|
|
logs Show guardian logs
|
|
block-app Add an app to block list
|
|
unblock-app Remove an app from block list
|
|
list-blocked Show blocked apps list
|
|
|
|
pair Pair with device over WiFi (Android 11+, no USB needed)
|
|
connect Connect to already-paired device over WiFi
|
|
disconnect Disconnect wireless ADB
|
|
|
|
Android Guardian provides:
|
|
- Persistent hosts-based ad/tracker blocking
|
|
- Automatic uninstallation of forbidden apps (browsers, food delivery, etc.)
|
|
- Protection that can ONLY be controlled via ADB connection
|
|
|
|
The module CANNOT be disabled from the Magisk app on the phone.
|
|
You MUST connect the phone to a PC and use this script to control it.
|
|
|
|
Wireless Setup (Android 11+):
|
|
1. On phone: Settings > Developer Options > Wireless debugging > Enable
|
|
2. Tap "Pair device with pairing code" to get IP:port and code
|
|
3. Run: $0 pair
|
|
4. Future connections: $0 connect
|
|
|
|
EOF
|
|
}
|
|
|
|
# Wireless ADB connection file
|
|
WIRELESS_CONFIG="$HOME/.config/android_guardian_wireless"
|
|
|
|
# shellcheck source=lib/android_device.sh
|
|
source "$SCRIPT_DIR/lib/android_device.sh"
|
|
# shellcheck source=lib/android_module.sh
|
|
source "$SCRIPT_DIR/lib/android_module.sh"
|
|
# shellcheck source=lib/android_commands.sh
|
|
source "$SCRIPT_DIR/lib/android_commands.sh"
|
|
|
|
# Main
|
|
# Initialize Android script (handles sudo, sets WORK_DIR)
|
|
init_android_script "$@"
|
|
|
|
COMMAND="${1:-install}"
|
|
shift || true
|
|
|
|
case "$COMMAND" in
|
|
install)
|
|
cmd_install
|
|
;;
|
|
status)
|
|
cmd_status
|
|
;;
|
|
disable)
|
|
cmd_disable
|
|
;;
|
|
enable)
|
|
cmd_enable
|
|
;;
|
|
uninstall)
|
|
cmd_uninstall
|
|
;;
|
|
logs)
|
|
cmd_logs
|
|
;;
|
|
block-app)
|
|
cmd_block_app "$@"
|
|
;;
|
|
unblock-app)
|
|
cmd_unblock_app "$@"
|
|
;;
|
|
list-blocked)
|
|
cmd_list_blocked
|
|
;;
|
|
pair)
|
|
cmd_pair
|
|
;;
|
|
connect)
|
|
cmd_connect
|
|
;;
|
|
disconnect)
|
|
cmd_disconnect
|
|
;;
|
|
-h | --help | help)
|
|
show_usage
|
|
;;
|
|
*)
|
|
echo "Unknown command: $COMMAND"
|
|
show_usage
|
|
exit 1
|
|
;;
|
|
esac
|