From e0f00873e5a75d34ca08a9a82e12f6a58a0b6b4a Mon Sep 17 00:00:00 2001 From: bcambl Date: Fri, 12 Mar 2021 19:43:01 -0600 Subject: [PATCH] remove unsupported rpm whiptail user prompt - remove support for unmaintained distro 'fedberry' Signed-off-by: bcambl --- automated install/basic-install.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 8539a61d..77a0b492 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -347,7 +347,7 @@ elif is_command rpm ; then PIHOLE_DEPS=(cronie curl findutils nmap-ncat sudo unzip libidn2 psmisc sqlite libcap lsof) # If the host OS is Fedora, - if grep -qiE 'fedora|fedberry' /etc/redhat-release; then + if grep -qiE 'fedora' /etc/redhat-release; then # all required packages should be available by default with the latest fedora release : # continue # or if host OS is CentOS, @@ -365,13 +365,7 @@ elif is_command rpm ; then fi fi else - # Warn user of unsupported version of Fedora or CentOS but allow advanced users to manually continue via whiptail prompt. - if ! whiptail --defaultno --title "Unsupported RPM based distribution" --yesno "Would you like to continue installation on an unsupported RPM based distribution?\\n" "${r}" "${c}"; then - printf " %b Aborting installation due to unsupported RPM based distribution\\n" "${CROSS}" - exit # exit the installer - else - printf " %b Continuing installation with unsupported RPM based distribution\\n" "${INFO}" - fi + printf " %b Continuing installation with unsupported RPM based distribution\\n" "${INFO}" fi # If neither apt-get or yum/dnf package managers were found