arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 06:08:21 +00:00
Code Issues Releases Wiki Activity

Spinner blocks set -e trying to get it in functions that won't crash out...

Browse Source
This commit is contained in:
Dan Schaper 2016-10-10 07:25:43 -07:00
parent b79059ebdb
commit 94f6354c94
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
automated install/basic-install.sh
View File

@ -626,7 +626,7 @@ update_pacakge_cache() {
#update package lists #update package lists
echo ":::" echo ":::"
echo -n "::: $PKG_MANAGER update has not been run today. Running now..." echo -n "::: $PKG_MANAGER update has not been run today. Running now..."
${UPDATE_PKG_CACHE} > /dev/null 2>&1 ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
echo " done!" echo " done!"
fi fi
} }
@ -650,11 +650,12 @@ notify_package_updates_available(){
install_dependent_packages(){ install_dependent_packages(){
# Install packages passed in via argument array # Install packages passed in via argument array
# No spinner - conflicts with set -e
declare -a argArray1=("${!1}") declare -a argArray1=("${!1}")
for i in "${argArray1[@]}"; do for i in "${argArray1[@]}"; do
echo -n "::: Checking for $i..." echo -n "::: Checking for $i..."
package_check_install "${i}" &> /dev/null & spinner $! package_check_install "${i}" &> /dev/null
echo " installed!" echo " installed!"
done done
} }