mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 12:27:50 +01:00
Krzysztof kuhy Rudnicki
9b30329ca3
The five package-installation functions move to lib/packages.sh; main.sh keeps the top-level flow and sources the library after `set -e`. The first attempt sliced by line range and was thrown away. This file interleaves top-level commands - sudo -v, git config, the cp of makepkg.conf and pacman.conf - between its function definitions, so a range slice swept them into the library, where they would have run at source time and in the wrong order. Sourcing that version blocked on a sudo password prompt, which is how it was caught. The rebuild extracts function blocks by brace counting and leaves every other line exactly where it was. Verified with the new shfmt harness (all 5 functions verbatim), by a structural comparison of the top-level flow showing exactly one line added and none missing, and by sourcing the library to confirm it defines all five functions with no side effects. The script itself was NOT run: it does `sudo pacman -Sy`, overwrites /etc/makepkg.conf and /etc/pacman.conf, and installs AUR packages. Over-cap files 32 -> 31. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011w2Pj4Ek3ZNMQVYcFHgXDY
59 lines
3.9 KiB
JSON
59 lines
3.9 KiB
JSON
{
|
|
"intent": "Split fresh-install/main.sh (308 lines) into an entry script and a sourced package-helpers library, both under the 250-line cap, without changing the order of any top-level step.",
|
|
"scope": [
|
|
"linux_configuration/scripts/single_use/fresh-install/main.sh 308 -> 200",
|
|
"New: .../fresh-install/lib/packages.sh 121 (the five installation functions)",
|
|
"Non-goal: any behaviour change; this script installs packages and was not executed"
|
|
],
|
|
"changes": [
|
|
"Extracted the five top-level functions - play_error_sound, install_from_aur, try_aur_install, process_packages, all_subpackages_installed - into lib/packages.sh, each with the comment directly above it.",
|
|
"main.sh sources the library immediately after `set -e`, using the SCRIPT_DIR idiom with a `# shellcheck source=` directive relative to the script's own directory, per the repo convention for new sourced libs.",
|
|
"The first attempt sliced by line range and was discarded: this file interleaves top-level commands (sudo -v, git config, cp of makepkg.conf and pacman.conf) between the function definitions, so a range slice swept them into the library where they would have run at source time, out of order. The rebuild extracts function blocks by brace counting and leaves every other line where it was."
|
|
],
|
|
"verification": [
|
|
{
|
|
"command": "bash meta/scripts/verify_shell_split.sh HEAD .../main.sh .../lib/packages.sh .../main.sh",
|
|
"result": "pass",
|
|
"evidence": "IDENTICAL: all 5 top-level functions moved verbatim, via the shfmt-normalised per-function hash."
|
|
},
|
|
{
|
|
"command": "Structural comparison of the top-level flow before and after",
|
|
"result": "pass",
|
|
"evidence": "Exactly one line added to main.sh (the source line), zero lines missing, and the surviving order is preserved. Function blocks were removed structurally rather than by grep, so function bodies could not be mistaken for top-level code."
|
|
},
|
|
{
|
|
"command": "bash -c '. lib/packages.sh; declare -F <each of the five>'",
|
|
"result": "pass",
|
|
"evidence": "All five functions defined, and the source completes with no side effects. This is the check that caught the bad first attempt: sourcing that version hit `sudo -v` and blocked on a password prompt."
|
|
},
|
|
{
|
|
"command": "bash -n on both files",
|
|
"result": "pass",
|
|
"evidence": "Both parse. The script itself was deliberately NOT executed: it runs `sudo pacman -Sy`, copies over /etc/makepkg.conf and /etc/pacman.conf, and installs AUR packages."
|
|
},
|
|
{
|
|
"command": "grep triage for a deployed copy of main.sh",
|
|
"result": "pass",
|
|
"evidence": "No other script copies or installs it, so the entry+lib shape is safe here - unlike the phone_focus_mode scripts, whose deploy.sh copies a hardcoded per-file list and never deploys lib/."
|
|
},
|
|
{
|
|
"command": "pre-commit run --files <both files>",
|
|
"result": "pass",
|
|
"evidence": "All hooks pass, including shfmt and shellcheck."
|
|
},
|
|
{
|
|
"command": "bash ~/utils/scripts/check_file_length.sh --all",
|
|
"result": "pass",
|
|
"evidence": "31 files over cap, down from 32. The two files are 200 and 121 lines."
|
|
}
|
|
],
|
|
"risks": [
|
|
"main.sh at 200 lines has 50 lines of headroom. Its remaining bulk is the top-level package loop, which would need a different seam (a function extracted from inline code) to shrink further - that is a behaviour-preserving refactor rather than a move, so it was not attempted here.",
|
|
"This script is only ever run by hand on a fresh machine, so there is no test and no CI coverage for it. The verbatim proof and the source-time check are the whole of the evidence; a genuine end-to-end verification would mean reinstalling a machine."
|
|
],
|
|
"rollback": [
|
|
"git revert the commit; main.sh returns to its 308-line form and lib/packages.sh disappears.",
|
|
"After rollback, confirm bash -n main.sh still passes and that the file contains all five function definitions again."
|
|
]
|
|
}
|