Refactor install scripts to improve PATH handling and streamline package installation

Author: embtom

install-ansible

@@ -4,21 +4,19 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 USER_BIN="$(python3 -m site --user-base)/bin"
-export PATH="${PATH}:${USER_BIN}"
+export PATH="${USER_BIN}:${PATH}"
 
 # Persist to ~/.bashrc if not already present
 if ! grep -qF "${USER_BIN}" "${HOME}/.bashrc"; then
     printf '\nexport PATH="${PATH}:%s"\n' "${USER_BIN}" >> "${HOME}/.bashrc"
     echo "Added ${USER_BIN} to ~/.bashrc"
 fi
 
-PIPX_PACKAGES=(
-    ansible-core
-    ansible-lint
-    yamllint
-)
+# Install ansible-core as the primary package, then inject ansible-lint into
+# the same venv so both share the same ansible binary and collections path.
+pipx upgrade ansible-core 2>/dev/null || pipx install ansible-core
+pipx inject --include-apps --force ansible-core ansible-lint
 
-for package in "${PIPX_PACKAGES[@]}"; do
-    pipx upgrade "${package}" 2>/dev/null || pipx install "${package}"
-done
-ansible-galaxy collection install -r "${SCRIPT_DIR}/requirements.yml" --upgrade
+pipx upgrade yamllint 2>/dev/null || pipx install yamllint
+
+ansible-galaxy collection install -r "${SCRIPT_DIR}/requirements.yml" --upgrade

install-requirements

@@ -2,6 +2,7 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+REQ_FILE="${SCRIPT_DIR}/requirements.txt"
 
 # Ensure python3, pip, and venv are installed
 PYTHON_PACKAGES=(
@@ -16,10 +17,10 @@ if ! dpkg -s "${PYTHON_PACKAGES[@]}" &>/dev/null; then
     sudo apt-get install -y "${PYTHON_PACKAGES[@]}"
 fi
 
-# Ensure user-local bin is on PATH for pip-installed CLIs
-export PATH="${PATH}:$(python3 -m site --user-base)/bin"
+USER_BIN="$(python3 -m site --user-base)/bin"
+export PATH="${USER_BIN}:${PATH}"
 
-# Install requirements
-REQ_FILE="${SCRIPT_DIR}/requirements.txt"
+# Install pip if missing
 python3 -m ensurepip --upgrade >/dev/null 2>&1 || true
 python3 -m pip install --user --break-system-packages --upgrade -r "${REQ_FILE}"
+