Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3997 from pi-hole/revert-3537-patch-2

Browse source 
Revert "Further failsafe check for available APT packages"
This commit is contained in:
Adam Warner 2021-01-19 08:19:46 +00:00 committed by GitHub
commit 0c45d23c22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
automated install/basic-install.sh
View file

@ -85,8 +85,6 @@ QUERY_LOGGING=true
INSTALL_WEB_INTERFACE=true INSTALL_WEB_INTERFACE=true
PRIVACY_LEVEL=0 PRIVACY_LEVEL=0
CACHE_SIZE=10000 CACHE_SIZE=10000
# Placeholder variable for the list of available APT packages to be parsed subsequently
APT_PACKAGE_LIST=""
if [ -z "${USER}" ]; then if [ -z "${USER}" ]; then
USER="$(id -un)" USER="$(id -un)"
@ -181,19 +179,6 @@ is_command() {
command -v "${check_command}" >/dev/null 2>&1 command -v "${check_command}" >/dev/null 2>&1
} }
is_apt_package(){
# Checks whether a package, or one that provides it, is available in
# the installed APT repository lists.
local check_package=$1
# Obtain the list of available packages once
if [[ -z $APT_PACKAGE_LIST ]]; then
APT_PACKAGE_LIST=$(apt-cache dumpavail | grep -E '^P(ackage|rovides):')
fi
grep -qE " $check_package(,|$)" <<< "$APT_PACKAGE_LIST"
}
os_check() { os_check() {
if [ "$PIHOLE_SKIP_OS_CHECK" != true ]; then if [ "$PIHOLE_SKIP_OS_CHECK" != true ]; then
# This function gets a list of supported OS versions from a TXT record at versions.pi-hole.net # This function gets a list of supported OS versions from a TXT record at versions.pi-hole.net
@ -318,10 +303,10 @@ if is_command apt-get ; then
# Update package cache. This is required already here to assure apt-cache calls have package lists available. # Update package cache. This is required already here to assure apt-cache calls have package lists available.
update_package_cache || exit 1 update_package_cache || exit 1
# Debian 7 doesn't have iproute2 so check if it's available first # Debian 7 doesn't have iproute2 so check if it's available first
if is_apt_package iproute2; then if apt-cache show iproute2 > /dev/null 2>&1; then
iproute_pkg="iproute2" iproute_pkg="iproute2"
# Otherwise, check if iproute is available # Otherwise, check if iproute is available
elif is_apt_package iproute; then elif apt-cache show iproute > /dev/null 2>&1; then
iproute_pkg="iproute" iproute_pkg="iproute"
# Else print error and exit # Else print error and exit
else else
@ -341,10 +326,10 @@ if is_command apt-get ; then
# Check if installed php is v 7.0, or newer to determine packages to install # Check if installed php is v 7.0, or newer to determine packages to install
if [[ "$phpInsNewer" != true ]]; then if [[ "$phpInsNewer" != true ]]; then
# Prefer the php metapackage if it's there # Prefer the php metapackage if it's there
if is_apt_package php; then if apt-cache show php > /dev/null 2>&1; then
phpVer="php" phpVer="php"
# Else fall back on the php5 package if it's there # Else fall back on the php5 package if it's there
elif is_apt_package php5; then elif apt-cache show php5 > /dev/null 2>&1; then
phpVer="php5" phpVer="php5"
# Else print error and exit # Else print error and exit
else else
@ -356,9 +341,9 @@ if is_command apt-get ; then
phpVer="php$phpInsMajor.$phpInsMinor" phpVer="php$phpInsMajor.$phpInsMinor"
fi fi
# We also need the correct version for `php-sqlite` (which differs across distros) # We also need the correct version for `php-sqlite` (which differs across distros)
if is_apt_package "${phpVer}-sqlite3"; then if apt-cache show "${phpVer}-sqlite3" > /dev/null 2>&1; then
phpSqlite="sqlite3" phpSqlite="sqlite3"
elif is_apt_package "${phpVer}-sqlite"; then elif apt-cache show "${phpVer}-sqlite" > /dev/null 2>&1; then
phpSqlite="sqlite" phpSqlite="sqlite"
else else
printf " %b Aborting installation: No SQLite PHP module was found in APT repository.\\n" "${CROSS}" printf " %b Aborting installation: No SQLite PHP module was found in APT repository.\\n" "${CROSS}"