salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Perform checks when generating configs

Browse Source
This commit is contained in:
Salt 2019-06-22 02:48:04 -05:00
parent 8216f7af01
commit 65fe20c41a
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firestarter
View File

@ -342,6 +342,11 @@ step_check() {
if ! [ -d "$HOME" ] || ! [ -r "$HOME" ]; then if ! [ -d "$HOME" ] || ! [ -r "$HOME" ]; then
err "Inaccessible home directory: \"$HOME\"" 54 err "Inaccessible home directory: \"$HOME\"" 54
fi fi
if ! [ -d "$_configdir" ]; then
if ! mkdir -p "$_configdir" > /dev/null 2>&1; then
err "Failed to create configuration directory: \"$_configdir\"" 52
fi
fi
return 0 return 0
} }
step_preexecute() { step_preexecute() {
@ -422,12 +427,6 @@ step_preexecute() {
fi fi
} }
step_execute() { step_execute() {
# Ensure we have a config directory
if ! [ -d "$_configdir" ]; then
if ! mkdir -p "$_configdir" > /dev/null 2>&1; then
err "Failed to create configuration directory: \"$_configdir\"" 52
fi
fi
# Ensure we can log if we have to # Ensure we can log if we have to
if [ -n "$FS_NOLOG" ]; then if [ -n "$FS_NOLOG" ]; then
log "No logs will be created per FS_NOLOG" log "No logs will be created per FS_NOLOG"
@ -540,8 +539,7 @@ main() {
_dryrun=1 _dryrun=1
;; ;;
g) g)
step_generate _generate=1
exit $?
;; ;;
h) h)
step_printhelp step_printhelp
@ -557,10 +555,14 @@ main() {
done done
[ -n "$_dryrun" ] && log "Performing a dry run" [ -n "$_dryrun" ] && log "Performing a dry run"
step_check step_check
step_preexecute if [ -n "$_generate" ]; then
step_execute step_generate
step_postexecute else
step_wait step_preexecute
step_execute
step_postexecute
step_wait
fi
return 0 return 0
} }