From f1bddc6331ba2f91955f103d9e62355713fd8a27 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Mon, 1 Jul 2024 22:42:20 +0200 Subject: [PATCH] cleanup Signed-off-by: Marcel Bargull --- scripts/fix_rpm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/fix_rpm b/scripts/fix_rpm index d26362d..92b13d0 100755 --- a/scripts/fix_rpm +++ b/scripts/fix_rpm @@ -9,17 +9,17 @@ if [[ "$DISTRO_VER" == "7" ]]; then fi # Resolves a nasty NOKEY warning that appears when using yum. -if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then \ - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \ +if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 if [[ "$(uname -m)" == "ppc64le" ]]; then - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-ppc64le; + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-ppc64le elif [[ "$(uname -m)" == "aarch64" ]]; then - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64; + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 fi -elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos8" ]]; then \ - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial; \ -elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "ubi8" ]]; then \ - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release; \ -elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "almalinux8" ]]; then \ +elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos8" ]]; then + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial +elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "ubi8" ]]; then + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "almalinux8" ]]; then rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux fi