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

factor out installer_dependencies

Browse source
This commit is contained in:
Dan Schaper 2016-10-09 22:05:06 -07:00
parent 1fecdf42ca
commit d9e28a7422
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
automated install/basic-install.sh
View file

@ -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