gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unsupported rpm whiptail user prompt

Browse Source 
- remove support for unmaintained distro 'fedberry'

Signed-off-by: bcambl <blayne@blaynecampbell.com>
This commit is contained in:
bcambl
2021-03-12 19:43:01 -06:00
committed by Adam Warner
parent 3a122ed11a
commit 6a312500a0
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
automated install/basic-install.sh
View File

@@ -351,7 +351,7 @@ elif is_command rpm ; then
PIHOLE_DEPS=(cronie curl findutils nmap-ncat sudo unzip libidn2 psmisc sqlite libcap lsof) PIHOLE_DEPS=(cronie curl findutils nmap-ncat sudo unzip libidn2 psmisc sqlite libcap lsof)
# If the host OS is Fedora, # 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 # all required packages should be available by default with the latest fedora release
: # continue : # continue
# or if host OS is CentOS, # or if host OS is CentOS,
@@ -368,15 +368,9 @@ elif is_command rpm ; then
printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}" printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}"
fi fi
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 else
printf " %b Continuing installation with unsupported RPM based distribution\\n" "${INFO}" printf " %b Continuing installation with unsupported RPM based distribution\\n" "${INFO}"
fi fi
fi
# If neither apt-get or yum/dnf package managers were found # If neither apt-get or yum/dnf package managers were found
else else