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

Change the order of XDGs and firestarterrc

Browse Source
This commit is contained in:
Salt
2019-06-23 01:12:24 -05:00
parent 3786a076b1
commit 67a808016d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
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

10
firestarter
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