From 84cd4582dd4e1eb5d04d038cd92b77717e7b1e12 Mon Sep 17 00:00:00 2001 From: fb24m Date: Tue, 5 May 2026 00:49:38 +0400 Subject: [PATCH] install every package right after building --- sdata/dist-fedora/install-deps.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sdata/dist-fedora/install-deps.sh b/sdata/dist-fedora/install-deps.sh index a87009656..51494cb1a 100644 --- a/sdata/dist-fedora/install-deps.sh +++ b/sdata/dist-fedora/install-deps.sh @@ -45,7 +45,9 @@ function install_RPMS() { spec="$rpm_specs/$package.spec" installed_rpm_stamp=$(rpm -q --qf '%{NVRA}\n' "$package" 2>/dev/null || true) spec_stamp=$(rpmspec -q --qf '%{NVRA}\n' "$spec") - + arch=$(rpm --eval "%_arch") # if we somehow want aarch64?? + built_rpm_path="$rpmbuildroot/RPMS/$arch/$spec_stamp.rpm" + [[ -f "$spec" ]] || { echo "Missing spec: $spec" continue @@ -69,13 +71,12 @@ function install_RPMS() { sudo dnf install -y $(basename "$spec" .spec) nolock_qs=true fi - done - mapfile -t -d '' local_rpms < <(find "$rpmbuildroot/RPMS" -maxdepth 2 -type f -name '*.rpm' -not -name '*debug*' -print0) - if [[ ${#local_rpms[@]} -ge 1 ]]; then - echo -e "${STY_BLUE}Next command:${STY_RST} sudo dnf install ${local_rpms[@]} -y" - r x sudo dnf install "${local_rpms[@]}" -y - fi + if [[ -f "$rpmbuildroot/RPMS/x86_64/$spec_stamp.rpm" ]]; then + echo -e "${STY_BLUE}Next command:${STY_RST} sudo dnf install $rpmbuildroot/RPMS/x86_64/$spec_stamp.rpm -y" + r x sudo dnf install "$rpmbuildroot/RPMS/x86_64/$spec_stamp.rpm" -y + fi + done x cd ${REPO_ROOT} }