mirror of
https://github.com/pi-hole/pi-hole
synced 2025-01-03 12:40:56 +00:00
factor out installer_dependencies
This commit is contained in:
parent
1fecdf42ca
commit
d9e28a7422
@ -578,6 +578,7 @@ stopServices() {
|
|||||||
fi
|
fi
|
||||||
echo " done."
|
echo " done."
|
||||||
}
|
}
|
||||||
|
|
||||||
update_pacakge_cache() {
|
update_pacakge_cache() {
|
||||||
#Running apt-get update/upgrade with minimal output can cause some issues with
|
#Running apt-get update/upgrade with minimal output can cause some issues with
|
||||||
#requiring user input (e.g password for phpmyadmin see #218)
|
#requiring user input (e.g password for phpmyadmin see #218)
|
||||||
@ -613,13 +614,13 @@ notify_package_updates_available(){
|
|||||||
echo ":::"
|
echo ":::"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
installerDependencies() {
|
|
||||||
|
|
||||||
echo ":::"
|
install_dependent_packages(){
|
||||||
echo "::: Checking installer dependencies..."
|
declare -a argArray1=("${!1}")
|
||||||
for i in "${INSTALLER_DEPS[@]}"; do
|
|
||||||
|
for i in "${argArray1[@]}"; do
|
||||||
echo -n "::: Checking for $i..."
|
echo -n "::: Checking for $i..."
|
||||||
package_check_install ${i} > /dev/null
|
package_check ${i} > /dev/null
|
||||||
echo " installed!"
|
echo " installed!"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -919,7 +920,7 @@ update_pacakge_cache
|
|||||||
notify_package_updates_available
|
notify_package_updates_available
|
||||||
|
|
||||||
# Install packages used by this installation script
|
# Install packages used by this installation script
|
||||||
installerDependencies
|
install_dependent_packages INSTALLER_DEPS[@]
|
||||||
|
|
||||||
if [[ ${useUpdateVars} == false ]]; then
|
if [[ ${useUpdateVars} == false ]]; then
|
||||||
welcomeDialogs
|
welcomeDialogs
|
||||||
|
Loading…
Reference in New Issue
Block a user