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

First run the function, then return the exit code. Fixes #206.

Browse source
This commit is contained in:
Pedro Algarvio 2013-08-16 21:25:01 +01:00
parent 759cf50182
commit d4b267118c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootstrap-salt.sh
View file

@ -986,7 +986,7 @@ copyfile() {
elif [ -f "$dfile" ] && [ $overwrite -eq $BS_TRUE ]; then
# The destination exist and we're overwriting
echodebug "Overriding $dfile with $sfile"
cp -f "$sfile" "$dfile" || return 2
cp -f "$sfile" "$dfile" || return 1
elif [ -f "$dfile" ] && [ $overwrite -ne $BS_TRUE ]; then
echodebug "Not overriding $dfile with $sfile"
fi
@ -1017,7 +1017,8 @@ movefile() {
# We're being told not to move files, instead copy them so we can keep
# them around
echodebug "Since BS_KEEP_TEMP_FILES=1 we're copying files instead of moving them"
return copyfile "$sfile" "$dfile" $overwrite
copyfile "$sfile" "$dfile" $overwrite
return $?
fi
# Does the source file exist?