From cddf8834fcd3eafbde1d53b9b984d4952e3ba949 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Wed, 24 May 2023 13:48:59 +0800 Subject: [PATCH] Fix tool installation failure caused by missing epel.repo file Signed-off-by: wangzhe --- dist/install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dist/install.sh b/dist/install.sh index 728ba4a..784271f 100755 --- a/dist/install.sh +++ b/dist/install.sh @@ -7,7 +7,6 @@ mirror_site="${MIRROR_SITE:-https://mirrors.openanolis.cn}" -jsonfile="/var/log/centostoanolis.json" report_error_in_jsonfile() { unixtime=`date +%s` errMsg_inline=$(echo "$3" | tr -d '\n\r\t"\\') @@ -26,11 +25,10 @@ disable_migration_repo() { # config epel epel_repo_config() { - rpm -q epel-release && return 0 - [ -f /etc/yum.repos.d/epel.repo ] && return 0 + rpm -q epel-release && [ -f /etc/yum.repos.d/epel.repo ] && return 0 # maybe using filename epel-7.repo since this guide https://developer.aliyun.com/mirror/epel - [ -f /etc/yum.repos.d/epel-7.repo ] && return 0 - [ -f /etc/yum.repos.d/CentOS-Linux-epel.repo ] && return 0 + rpm -q epel-release && [ -f /etc/yum.repos.d/epel-7.repo ] && return 0 + rpm -q epel-release && [ -f /etc/yum.repos.d/CentOS-Linux-epel.repo ] && return 0 major_release=`rpm --eval '%{centos_ver}'` [ "$?" -eq 0 ] || { -- Gitee