arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-08 15:10:55 +00:00
Code Issues Releases Wiki Activity

Add loop to wait if package manager is blocked externally

Browse Source
This commit is contained in:
DL6ER 2017-03-03 11:28:35 +01:00
parent 044afa838c
commit 2c762899de
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
automated install/basic-install.sh
View File

@ -59,7 +59,7 @@ distro_check() {
if command -v apt-get &> /dev/null; then if command -v apt-get &> /dev/null; then
#Debian Family #Debian Family
############################################# #############################################
PKG_MANAGER="apt-get" PKG_MANAGER="test_dpkg_lock; apt-get"
UPDATE_PKG_CACHE="${PKG_MANAGER} update" UPDATE_PKG_CACHE="${PKG_MANAGER} update"
PKG_INSTALL=(${PKG_MANAGER} --yes --no-install-recommends install) PKG_INSTALL=(${PKG_MANAGER} --yes --no-install-recommends install)
# grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE # grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE
@ -87,6 +87,32 @@ if command -v apt-get &> /dev/null; then
LIGHTTPD_CFG="lighttpd.conf.debian" LIGHTTPD_CFG="lighttpd.conf.debian"
DNSMASQ_USER="dnsmasq" DNSMASQ_USER="dnsmasq"
test_dpkg_lock() {
i=0
while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
echo -en "\r::: Waiting for package manager to finish"
j=0
while [ $j -lt 6 ]; do
if [ $j -lt $i ]; then
echo -n "."
else
echo -n " "
fi
((j=j+1))
done
sleep 0.5
if [ $i -lt 6 ]; then
((i=i+1))
else
i=0
fi
done
# Add final newline only if we entered the loop at least once
if [ $j -gt 0 ]; then
echo ""
fi
}
elif command -v rpm &> /dev/null; then elif command -v rpm &> /dev/null; then
# Fedora Family # Fedora Family
if command -v dnf &> /dev/null; then if command -v dnf &> /dev/null; then