diff options
| author | Dan Schaper <dan.schaper@pi-hole.net> | 2022-07-03 03:47:41 +0300 |
|---|---|---|
| committer | Dan Schaper <dan.schaper@pi-hole.net> | 2022-07-03 20:47:05 +0300 |
| commit | 80bef5f6b6840253bc8fe5ec0941f15977623eed (patch) | |
| tree | 357c8f8b6cb8f2bfc15cffdf28cf1e33f26e4ec9 /automated install | |
| parent | 17485023a22e1e0329fcae489ec8c876b0cf1dc6 (diff) | |
Direct pull for epel-release
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Diffstat (limited to 'automated install')
| -rwxr-xr-x | automated install/basic-install.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 953e6203..3f5c972f 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -397,14 +397,16 @@ select_rpm_php(){ unset CENTOS7_PIHOLE_WEB_DEPS fi # CentOS requires the EPEL repository to gain access to Fedora packages - EPEL_PKG="epel-release" - rpm -q ${EPEL_PKG} &> /dev/null || rc=$? - if [[ $rc -ne 0 ]]; then - printf " %b Enabling EPEL package repository (https://fedoraproject.org/wiki/EPEL)\\n" "${INFO}" - "${PKG_INSTALL[@]}" ${EPEL_PKG} &> /dev/null - printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}" + if [[ CURRENT_CENTOS_VERSION -eq 7 ]]; then + EPEL_PKG="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + elif [[ CURRENT_CENTOS_VERSION -eq 8 ]]; then + EPEL_PKG="https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" fi + printf " %b Enabling EPEL package repository (https://fedoraproject.org/wiki/EPEL)\\n" "${INFO}" + "${PKG_INSTALL[@]}" ${EPEL_PKG} &> /dev/null + printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}" + # The default php on CentOS 7.x is 5.4 which is EOL # Check if the version of PHP available via installed repositories is >= to PHP 7 AVAILABLE_PHP_VERSION=$("${PKG_MANAGER}" info php | grep -i version | grep -o '[0-9]\+' | head -1) |