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

Work on separating out the different functions

Browse Source
This commit is contained in:
Salt 2020-06-15 09:35:45 -05:00
parent 16f58d2604
commit 86cca17f45
1 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
firestarter
View File

@ -187,26 +187,7 @@ step_execute() {
fi fi
# Skip our logs directory # Skip our logs directory
[ "$_optlogdir" == "$file" ] && continue [ "$_optlogdir" == "$file" ] && continue
local filename="$(basename -- "$file")" fs_exec "$file"
local logfile="$_optlogdir/$filename.log"
if gettarget "$file"; then
# It's a defaults file with a selected target
target="$_return"
log "Found target for $filename: \"$target\""
[ -n "$_optdryrun" ] && continue
if [ -f "$logfile" ]; then
[ -f "$logfile.old" ] && rm "$logfile.old"
mv "$logfile" "$logfile.old"
fi
bash -c "$target" > "$logfile" 2>&1 &
elif [ $? = 50 ] && [ -x "$file" ]; then
# It's a shell script or executable symlink
log "Executing file: \"$filename\""
[ -n "$_optdryrun" ] && continue
"$file" > "$logfile" 2>&1 &
else
warn "Could not execute file: \"$filename\""
fi
done done
} }
step_postexecute() { step_postexecute() {
@ -277,13 +258,21 @@ step_logout() {
printhelp() { printhelp() {
cat << EOF cat << EOF
Usage: $_name [OPTION]... Usage: $_name [OPTION]... {COMMAND}
-d Perform a dry run; print what programs would have been -d Perform a dry run; print what programs would have been
executed instead of doing so executed instead of doing so
-h Print this help text -h Print this help text
-v Print more status messages. Stacks -v Print more status messages. Stacks
Commands:
If no command is specified, firestarter will behave as though init had been
provided
init Start all services and wait
start Start the provided service, fork, and exit
status Show status information
Environment Variables: Environment Variables:
FS_DIEONWM If nonempty, end the session when the WM dies. FS_DIEONWM If nonempty, end the session when the WM dies.
@ -293,6 +282,54 @@ Copyright (c) 2019 rehashedsalt@cock.li
Licensed under the MIT license Licensed under the MIT license
EOF EOF
} }
fs_exec() {
# Execute an fsdefaults file
[ -z "$1" ] && return 1
local file="$1"
local filename="$(basename -- "$file")"
local logfile="$_optlogdir/$filename.log"
if gettarget "$file"; then
# It's a defaults file with a selected target
target="$_return"
log "Found target for $filename: \"$target\""
[ -n "$_optdryrun" ] && return
if [ -f "$logfile" ]; then
[ -f "$logfile.old" ] && rm "$logfile.old"
mv "$logfile" "$logfile.old"
fi
bash -c "$target" > "$logfile" 2>&1 &
elif [ $? = 50 ] && [ -x "$file" ]; then
# It's a shell script or executable symlink
log "Executing file: \"$filename\""
[ -n "$_optdryrun" ] && return
"$file" > "$logfile" 2>&1 &
else
warn "Could not execute file: \"$filename\""
fi
}
firestart() {
# Really main firestarter function
local action="${_args[0]}"
[ -z "$action" ] && action=init
case "$action" in
init)
[ -n "$_optdryrun" ] && log "Performing a dry run"
step_preexecute
step_execute
step_wait
step_logout
;;
start)
error "NYI" 128
;;
status)
error "NYI" 128
;;
*)
error "Unknown action: $action" 51
;;
esac
}
# Main # Main
main() { main() {
@ -359,11 +396,7 @@ main() {
fi fi
# Do the do # Do the do
[ -n "$_optdryrun" ] && log "Performing a dry run" firestart
step_preexecute
step_execute
step_wait
step_logout
exit 0 exit 0
} }