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

only create one temp file and remove during cleanup

Browse source
This commit is contained in:
Matt McKinnon 2019-03-20 14:36:28 -04:00
parent 462905f137
commit 0a3d5c3911
No known key found for this signature in database
GPG key ID: 7DCCE47300DEB278
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrap-salt.sh
View file

@ -521,6 +521,12 @@ __exit_cleanup() {
rm -f "$LOGPIPE"
fi
# Remove the temporary apt error file when the script exits
if [ -f "$APT_ERR" ]; then
echodebug "Removing the temporary apt error file $APT_ERR"
rm -f "$APT_ERR"
fi
# Kill tee when exiting, CentOS, at least requires this
# shellcheck disable=SC2009
TEE_PID=$(ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}')
@ -1813,12 +1819,12 @@ __function_defined() {
# a boot process, such as on AWS AMIs. This func will wait until the boot
# process is finished so the script doesn't exit on a locked proc.
#----------------------------------------------------------------------------------------------------------------------
APT_ERR=$(mktemp /tmp/apt_error.XXXX)
__wait_for_apt(){
# Timeout set at 15 minutes
WAIT_TIMEOUT=900
# Run our passed in apt command
APT_ERR=$(mktemp /tmp/apt_error.XXXX)
"${@}" 2>$APT_ERR
APT_RETURN=$?
@ -1838,7 +1844,6 @@ __wait_for_apt(){
fi
done
rm $APT_ERR
return $APT_RETURN
}