diff --git a/includes/post/rpm-repos-enable.ksi b/includes/post/rpm-repos-enable.ksi index c29d5e4..416bb7e 100644 --- a/includes/post/rpm-repos-enable.ksi +++ b/includes/post/rpm-repos-enable.ksi @@ -10,8 +10,8 @@ DNF_RELEASEVER="$(dnf config-manager --dump-variables | grep 'releasever' | awk # This repository is a given since it provides 'uboot-images-armv8' and # 'uboot-tools', which are **required**. dnf config-manager --assumeyes --add-repo "https://download.rockylinux.org/pub/sig/${DNF_RELEASEVER}/altarch/${MACHINE_ARCH}/altarch-common" -if ! dnf repolist --enabled | grep "download.rockylinux.org_pub_sig_${DNF_RELEASE_VER}_altarch_${MACHINE_ARCH}_altarch-common" > /dev/null; then - dnf config-manager --set-enabled "download.rockylinux.org_pub_sig_${DNF_RELEASE_VER}_altarch_${MACHINE_ARCH}_altarch-common" || exit 1 +if ! dnf repolist --enabled | grep "download.rockylinux.org_pub_sig_${DNF_RELEASEVER}_altarch_${MACHINE_ARCH}_altarch-common" > /dev/null; then + dnf config-manager --set-enabled "download.rockylinux.org_pub_sig_${DNF_RELEASEVER}_altarch_${MACHINE_ARCH}_altarch-common" || exit 1 fi if dnf list installed | grep '@epel' > /dev/null || dnf list installed | grep 'epel-release' > /dev/null; then @@ -33,7 +33,7 @@ fi # This is my (Pratham Patel) COPR that I use to provide 'kernel-stable-tfg' and # 'kernel-lts-tfg' packages. I intend to keep it up-to-date so this is enabled # so that users can get updates whenever upstream bumps versions. -dnf copr enable --assumeyes prathampatel/kernel-tfg "rhel-${DNF_RELEASE_VER}-${MACHINE_ARCH}" +dnf copr enable --assumeyes prathampatel/kernel-tfg "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' > /dev/null; then dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' || exit 1 fi @@ -42,7 +42,7 @@ if dnf list installed | grep "kernel-next-tfg\|kernel-rc-tfg" > /dev/null; then # The user has installed a package that provides either kernel-next or # kernel-rc which comes from the the 'prathampatel/kernel-testing-tfg' # COPR repository. Since that is used, enable it so updates reach the user. - dnf copr enable --assumeyes prathampatel/kernel-testing-tfg "rhel-${DNF_RELEASE_VER}-${MACHINE_ARCH}" + dnf copr enable --assumeyes prathampatel/kernel-testing-tfg "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-testing-tfg' > /dev/null; then dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-testing-tfg' || exit 1 fi