rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2021-08-03 21:48:26 +01:00
parent b729a44209
commit 1358209a9a
7 changed files with 62 additions and 62 deletions

View File

@@ -276,7 +276,7 @@ os_check() {
}
# Compatibility
distro_check() {
package_manager_detect() {
# If apt-get is installed, then we know it's part of the Debian family
if is_command apt-get ; then
# Set some global variables here
@@ -1950,7 +1950,7 @@ installLogrotate() {
if [[ -f ${target} ]]; then
printf "\\n\\t%b Existing logrotate file found. No changes made.\\n" "${INFO}"
# Return value isn't that important, using 2 to indicate that it's not a fatal error but
# the function did not complete.
# the function did not complete.
return 2
fi
# Copy the file over from the local repo
@@ -2643,7 +2643,7 @@ main() {
fi
# Check for supported distribution
distro_check
package_manager_detect
# If the setup variable file exists,
if [[ -f "${setupVars}" ]]; then

View File

@@ -42,8 +42,8 @@ source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
# setupVars set in basic-install.sh
source "${setupVars}"
# distro_check() sourced from basic-install.sh
distro_check
# package_manager_detect() sourced from basic-install.sh
package_manager_detect
# Install packages used by the Pi-hole
DEPS=("${INSTALLER_DEPS[@]}" "${PIHOLE_DEPS[@]}")
@@ -113,7 +113,7 @@ removeNoPurge() {
fi
fi
echo -e "${OVER} ${TICK} Removed Web Interface"
# Attempt to preserve backwards compatibility with older versions
# to guarantee no additional changes were made to /etc/crontab after
# the installation of pihole, /etc/crontab.pihole should be permanently