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

Source in firestarterrc BEFORE starting all the things

Browse Source
This commit is contained in:
Salt
2020-09-25 05:40:48 -05:00
parent 24282ff7b5
commit eba177726e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firestarter
View File

@@ -222,6 +222,8 @@ fsstatus() {
step_preexecute() { step_preexecute() {
# Special things that can't use simple configuration files # Special things that can't use simple configuration files
[ -n "$_optdryrun" ] && return 0 [ -n "$_optdryrun" ] && return 0
# Execute a user rc if it exists
[ -r "$HOME/.firestarterrc" ] && . "$HOME/.firestarterrc"
#[ -r "$HOME/.xsessionrc" ] && . "$HOME/.xsessionrc" #[ -r "$HOME/.xsessionrc" ] && . "$HOME/.xsessionrc"
export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-firestarter}" export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-firestarter}"
[ -n "$FIRESTARTER" ] && [ "$FIRESTARTER_DISPLAY" == "$DISPLAY" ] error "Firestarter is already running on $DISPLAY: $FIRESTARTER" 55 [ -n "$FIRESTARTER" ] && [ "$FIRESTARTER_DISPLAY" == "$DISPLAY" ] error "Firestarter is already running on $DISPLAY: $FIRESTARTER" 55
@@ -344,12 +346,6 @@ step_postexecute() {
fi fi
# Dumb polybar workaround # Dumb polybar workaround
killall polybar -SIGUSR1 killall polybar -SIGUSR1
# Execute a user rc if it exists
local firestarterrc="$HOME/.firestarterrc"
if [ -r "$firestarterrc" ] && [ -z "$dryrun" ]; then
log "Executing rc script: $firestarterrc"
. "$firestarterrc"
fi
# Propogate environment variables # Propogate environment variables
if [ -n "$_hasdbus" ]; then if [ -n "$_hasdbus" ]; then
has dbus-update-activation-environment && \ has dbus-update-activation-environment && \