saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consistent spacing

Browse source
This commit is contained in:
Pedro Algarvio 2019-05-15 14:21:23 +01:00
parent 8959d1b385
commit 93ef02dcbd
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bootstrap-salt.sh
View file

@ -1830,18 +1830,18 @@ __wait_for_apt(){
# Make sure we're not waiting on a lock
while [ $APT_RETURN -ne 0 ] && grep -q '^E: Could not get lock' "$APT_ERR"; do
echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..."
sleep 1
WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1))
echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..."
sleep 1
WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1))
if [ "$WAIT_TIMEOUT" -eq 0 ]; then
echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long."
echoerror "Bootstrap script cannot proceed. Aborting."
return 1
else
"${@}" 2>"$APT_ERR"
APT_RETURN=$?
fi
if [ "$WAIT_TIMEOUT" -eq 0 ]; then
echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long."
echoerror "Bootstrap script cannot proceed. Aborting."
return 1
else
"${@}" 2>"$APT_ERR"
APT_RETURN=$?
fi
done
return $APT_RETURN
@ -7136,3 +7136,5 @@ else
fi
exit 0
# vim: set sts=4 ts=4 et