mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-29 08:12:20 +00:00
Fix rare case when apt and rpm package managers are found
Signed-off-by: Christian König <github@yubiuser.dev>
This commit is contained in:
parent
4dbf9a0bbb
commit
fdda40994b
1 changed files with 8 additions and 2 deletions
|
@ -484,9 +484,8 @@ build_dependency_package(){
|
||||||
|
|
||||||
# Move back into the directory the user started in
|
# Move back into the directory the user started in
|
||||||
popd &> /dev/null || return 1
|
popd &> /dev/null || return 1
|
||||||
fi
|
|
||||||
|
|
||||||
if is_command rpm; then
|
elif is_command rpm; then
|
||||||
# move into the tmp directory
|
# move into the tmp directory
|
||||||
pushd /tmp &>/dev/null || return 1
|
pushd /tmp &>/dev/null || return 1
|
||||||
|
|
||||||
|
@ -517,6 +516,13 @@ build_dependency_package(){
|
||||||
|
|
||||||
# Move back into the directory the user started in
|
# Move back into the directory the user started in
|
||||||
popd &> /dev/null || return 1
|
popd &> /dev/null || return 1
|
||||||
|
|
||||||
|
# If neither apt-get or yum/dnf package managers were found
|
||||||
|
else
|
||||||
|
# we cannot build required packages
|
||||||
|
printf " %b No supported package manager found\\n" "${CROSS}"
|
||||||
|
# so exit the installer
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the build directory
|
# Remove the build directory
|
||||||
|
|
Loading…
Reference in a new issue