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

wmstartup: Move common service functions out of individual services

Browse Source
This commit is contained in:
Salt 2018-08-27 12:35:25 -05:00
parent 731560f736
commit df605a74b2
12 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.config/dtfscripts/services/common.bash → .config/dtfscripts/common_service.sh
View File

1
.config/dtfscripts/services/compton.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Compton" service_name="Compton"
service_process="compton" service_process="compton"

1
.config/dtfscripts/services/conky.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Conky" service_name="Conky"
service_process="conky" service_process="conky"

1
.config/dtfscripts/services/dropbox.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Dropbox" service_name="Dropbox"
service_process="dropbox" service_process="dropbox"
service_kill_on_reload="false" service_kill_on_reload="false"

1
.config/dtfscripts/services/dunst.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Dunst" service_name="Dunst"
service_process="dunst" service_process="dunst"

1
.config/dtfscripts/services/kill_krunner.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Krunner" service_name="Krunner"
service_process="krunner" service_process="krunner"

1
.config/dtfscripts/services/plasmashell.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Plasma" service_name="Plasma"
service_process="plasmashell" service_process="plasmashell"

1
.config/dtfscripts/services/polybar.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Polybar" service_name="Polybar"
service_process="polybar" service_process="polybar"

1
.config/dtfscripts/services/redshift.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Redshift" service_name="Redshift"
service_process="redshift" service_process="redshift"
service_kill_on_reload="false" service_kill_on_reload="false"

1
.config/dtfscripts/services/sxhkd.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="sxhkd" service_name="sxhkd"
service_process="sxhkd" service_process="sxhkd"

1
.config/dtfscripts/services/syncthing.dtf
View File

@ -6,7 +6,6 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
source $DTF_SERVICES_DIR/common.bash
service_name="Syncthing" service_name="Syncthing"
service_process="syncthing" service_process="syncthing"
service_kill_on_reload="false" service_kill_on_reload="false"

8
.config/dtfscripts/wmstartup.sh
View File

@ -62,10 +62,11 @@ if [[ "$XDG_RUNTIME_DIR" == "" ]]; then
fi fi
## Set some more variables ## Set some more variables
export DTF_SERVICES_DIR="$XDG_CONFIG_HOME/dtfscripts/services" export DTF_CONFIG_HOME="$XDG_CONFIG_HOME/dtfscripts"
export DTF_SERVICES_DIR="$DTF_CONFIG_HOME/services"
## Load device-specific scripts ## Load device-specific scripts
if [[ -x "$XDG_CONFIG_HOME/dtfscripts/devices/$(hostname).rc" ]]; then if [[ -x "$DTF_CONFIG_HOME/devices/$(hostname).rc" ]]; then
dtf_log "Sourcing devices/$(hostname).rc" dtf_log "Sourcing devices/$(hostname).rc"
source $HOME/.config/dtfscripts/devices/$(hostname).rc source $HOME/.config/dtfscripts/devices/$(hostname).rc
fi fi
@ -94,7 +95,8 @@ for service in $DTF_SERVICES; do
dtf_log "Service is unexecutable: $service" dtf_log "Service is unexecutable: $service"
exit 1 exit 1
fi fi
source $service_full source "$DTF_CONFIG_HOME/common_service.sh"
source "$service_full"
if isup && [[ "$service_kill_on_reload" == "true" ]] ; then if isup && [[ "$service_kill_on_reload" == "true" ]] ; then
stop stop
fi fi