2025-12-06 19:32:31 +01:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
set -euo pipefail
|
|
|
|
|
|
Refactor pkgmgr installers, introduce capability-based execution, and replace manifest layer
References:
- Current ChatGPT conversation: https://chatgpt.com/share/6935d6d7-0ae4-800f-988a-44a50c17ba48
- Extended discussion: https://chatgpt.com/share/6935d734-fd84-800f-9755-290902b8cee8
Summary:
This commit performs a major cleanup and modernization of the installation pipeline:
1. Introduced a new capability-detection subsystem:
- Capabilities (python-runtime, make-install, nix-flake) are detected per installer/layer.
- Installers run only when they add new capabilities.
- Prevents duplicated work such as Python installers running when Nix already provides the runtime.
2. Removed deprecated pkgmgr.yml manifest installer:
- Dependency resolution is now delegated entirely to real package managers (Nix, pip, make, distro build tools).
- Simplifies layering and avoids unnecessary recursion.
3. Reworked OS-specific installers:
- Arch PKGBUILD now uses 'makepkg --syncdeps --cleanbuild --install --noconfirm'.
- Debian installer now builds proper .deb packages via dpkg-buildpackage + installs them.
- RPM installer now builds packages using rpmbuild and installs them via rpm.
4. Switched from remote GitHub flakes to local-flake execution:
- Wrapper now executes: nix run /usr/lib/package-manager#pkgmgr
- Avoids lock-file write attempts and improves reliability in CI.
5. Added bash -i based integration test:
- Correctly sources ~/.bashrc and evaluates alias + venv activation.
- ‘pkgmgr --help’ is now printed for debugging without failing tests.
6. Updated unit tests across all installers:
- Removed references to manifest installer.
- Adjusted expectations for new behaviors (makepkg, dpkg-buildpackage, rpmbuild).
- Added capability subsystem tests.
7. Improved flake.nix packaging logic:
- The entire project source tree is copied into the runtime closure.
- pkgmgr wrapper now executes runpy inside the packaged directory.
Together, these changes create a predictable, layered, capability-driven installer pipeline with consistent behavior across Arch, Debian, RPM, Nix, and Python layers.
2025-12-07 20:36:39 +01:00
|
|
|
FLAKE_DIR="/usr/lib/package-manager"
|
|
|
|
|
|
2025-12-11 18:33:02 +01:00
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
# Try to ensure that "nix" is on PATH (common locations + container user)
|
|
|
|
|
# ---------------------------------------------------------------------------
|
2025-12-09 05:31:55 +01:00
|
|
|
if ! command -v nix >/dev/null 2>&1; then
|
|
|
|
|
CANDIDATES=(
|
|
|
|
|
"/nix/var/nix/profiles/default/bin/nix"
|
|
|
|
|
"${HOME:-/root}/.nix-profile/bin/nix"
|
2025-12-11 18:33:02 +01:00
|
|
|
"/home/nix/.nix-profile/bin/nix"
|
2025-12-09 05:31:55 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
for candidate in "${CANDIDATES[@]}"; do
|
|
|
|
|
if [[ -x "$candidate" ]]; then
|
|
|
|
|
PATH="$(dirname "$candidate"):${PATH}"
|
|
|
|
|
export PATH
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
2025-12-11 18:33:02 +01:00
|
|
|
# ---------------------------------------------------------------------------
|
2025-12-12 20:47:31 +01:00
|
|
|
# If nix is still missing, try to run nix/init.sh once
|
2025-12-11 18:33:02 +01:00
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
if ! command -v nix >/dev/null 2>&1; then
|
2025-12-12 20:47:31 +01:00
|
|
|
if [[ -x "${FLAKE_DIR}/nix/init.sh" ]]; then
|
|
|
|
|
"${FLAKE_DIR}/nix/init.sh" || true
|
2025-12-11 18:33:02 +01:00
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
# Primary path: use Nix flake if available
|
|
|
|
|
# ---------------------------------------------------------------------------
|
2025-12-09 05:31:55 +01:00
|
|
|
if command -v nix >/dev/null 2>&1; then
|
|
|
|
|
exec nix run "${FLAKE_DIR}#pkgmgr" -- "$@"
|
|
|
|
|
fi
|
|
|
|
|
|
2025-12-13 21:25:02 +01:00
|
|
|
echo "[launcher] ERROR: 'nix' binary not found on PATH after init."
|
|
|
|
|
echo "[launcher] Nix is required to run pkgmgr (no Python fallback)."
|
2025-12-09 05:31:55 +01:00
|
|
|
exit 1
|