Merge branch 'master' of gitlab.com:rehashedsalt/firestarter

This commit is contained in:
Salt 2019-06-24 03:40:17 -05:00
commit 1fed8f80eb
2 changed files with 6 additions and 6 deletions

View File

@ -35,7 +35,7 @@ Every first uncommented line is a "check" command that must succeed in order for
Any file that does *not* have the initial "crunchdot" is executed normally. You can keep shell scripts or symlinks in here and they will be executed without issue. Any file that does *not* have the initial "crunchdot" is executed normally. You can keep shell scripts or symlinks in here and they will be executed without issue.
After all these programs have been started, firestarter starts XDG autostart applications and executes `~/.firestarterrc` if it exists. After all these programs have been started, firestarter executes `~/.firestarterrc` if it exists and then starts XDG autostart applications.
## Logging ## Logging

View File

@ -499,6 +499,11 @@ step_postexecute() {
read -t 1 -u 1023 read -t 1 -u 1023
done done
fi fi
# Execute a user script if it exists
if [ -r "$_firestarterrc" ] && [ -z "$_dryrun" ]; then
log "Executing .firestarterrc"
"$_firestarterrc"
fi
# Start XDG autostarters, if they exist # Start XDG autostarters, if they exist
if [ -z "$_dryrun" ]; then if [ -z "$_dryrun" ]; then
if has dex; then if has dex; then
@ -511,11 +516,6 @@ step_postexecute() {
err "Could not find an XDG autostarter" err "Could not find an XDG autostarter"
fi fi
fi fi
# Source in a user script if it exists
if [ -r "$_firestarterrc" ] && [ -z "$_dryrun" ]; then
log "Sourcing .firestarterrc"
"$_firestarterrc"
fi
} }
step_wait() { step_wait() {
[ -n "$_dryrun" ] && exit 0 [ -n "$_dryrun" ] && exit 0