From df9bf53a9d6516a1b76c7a7726bc9b5bda1a908c Mon Sep 17 00:00:00 2001 From: Salt Date: Thu, 27 Sep 2018 20:48:37 -0500 Subject: [PATCH] dtfscript: Move to dedicated folder --- .config/bspwm/bspwmrc | 2 +- .../dtfscripts => .dtfscripts}/common_service.sh | 0 {.config/dtfscripts => .dtfscripts}/common_task.sh | 0 .../dtfscripts => .dtfscripts}/devices/dsk-cstm-0.rc | 0 .../devices/lap-th-e560-0.rc | 0 {.config/dtfscripts => .dtfscripts}/dtfscript | 12 ++++++------ .../services/bspwm_sxhkd.dtf | 0 .../dtfscripts => .dtfscripts}/services/compton.dtf | 0 .../dtfscripts => .dtfscripts}/services/conky.dtf | 0 .../dtfscripts => .dtfscripts}/services/dropbox.dtf | 0 .../dtfscripts => .dtfscripts}/services/dunst.dtf | 0 .../services/plasmashell.dtf | 0 .../dtfscripts => .dtfscripts}/services/polybar.dtf | 0 .../dtfscripts => .dtfscripts}/services/redshift.dtf | 0 .../services/syncthing.dtf | 0 {.config/dtfscripts => .dtfscripts}/tasks/bspwm.sh | 0 .../tasks/bspwm_monitorset.sh | 0 .../dtfscripts => .dtfscripts}/tasks/kill_krunner.sh | 0 .../dtfscripts => .dtfscripts}/tasks/xrdbupdate.sh | 0 {.config/dtfscripts => .dtfscripts}/tasks/xset.sh | 0 20 files changed, 7 insertions(+), 7 deletions(-) rename {.config/dtfscripts => .dtfscripts}/common_service.sh (100%) rename {.config/dtfscripts => .dtfscripts}/common_task.sh (100%) rename {.config/dtfscripts => .dtfscripts}/devices/dsk-cstm-0.rc (100%) rename {.config/dtfscripts => .dtfscripts}/devices/lap-th-e560-0.rc (100%) rename {.config/dtfscripts => .dtfscripts}/dtfscript (93%) rename {.config/dtfscripts => .dtfscripts}/services/bspwm_sxhkd.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/compton.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/conky.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/dropbox.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/dunst.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/plasmashell.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/polybar.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/redshift.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/services/syncthing.dtf (100%) rename {.config/dtfscripts => .dtfscripts}/tasks/bspwm.sh (100%) rename {.config/dtfscripts => .dtfscripts}/tasks/bspwm_monitorset.sh (100%) rename {.config/dtfscripts => .dtfscripts}/tasks/kill_krunner.sh (100%) rename {.config/dtfscripts => .dtfscripts}/tasks/xrdbupdate.sh (100%) rename {.config/dtfscripts => .dtfscripts}/tasks/xset.sh (100%) diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 48a8bea6..732ad6d0 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -21,7 +21,7 @@ # SOFTWARE. # Load session startup script -dtfscript=$HOME/.config/dtfscripts/dtfscript +dtfscript="$HOME/.dtfscripts/dtfscript" if [[ -x "$dtfscript" ]]; then source "$dtfscript" exit 0 diff --git a/.config/dtfscripts/common_service.sh b/.dtfscripts/common_service.sh similarity index 100% rename from .config/dtfscripts/common_service.sh rename to .dtfscripts/common_service.sh diff --git a/.config/dtfscripts/common_task.sh b/.dtfscripts/common_task.sh similarity index 100% rename from .config/dtfscripts/common_task.sh rename to .dtfscripts/common_task.sh diff --git a/.config/dtfscripts/devices/dsk-cstm-0.rc b/.dtfscripts/devices/dsk-cstm-0.rc similarity index 100% rename from .config/dtfscripts/devices/dsk-cstm-0.rc rename to .dtfscripts/devices/dsk-cstm-0.rc diff --git a/.config/dtfscripts/devices/lap-th-e560-0.rc b/.dtfscripts/devices/lap-th-e560-0.rc similarity index 100% rename from .config/dtfscripts/devices/lap-th-e560-0.rc rename to .dtfscripts/devices/lap-th-e560-0.rc diff --git a/.config/dtfscripts/dtfscript b/.dtfscripts/dtfscript similarity index 93% rename from .config/dtfscripts/dtfscript rename to .dtfscripts/dtfscript index 99b5afd2..8d436133 100755 --- a/.config/dtfscripts/dtfscript +++ b/.dtfscripts/dtfscript @@ -63,12 +63,12 @@ if [[ "$XDG_RUNTIME_DIR" == "" ]]; then fi ## Set some more variables -export DTF_CONFIG_HOME="$XDG_CONFIG_HOME/dtfscripts" -export DTF_SERVICES_DIR="$DTF_CONFIG_HOME/services" -export DTF_TASKS_DIR="$DTF_CONFIG_HOME/tasks" +export DTF_HOME="$HOME/.dtfscripts" +export DTF_SERVICES_DIR="$DTF_HOME/services" +export DTF_TASKS_DIR="$DTF_HOME/tasks" ## Load device-specific scripts -if [[ -x "$DTF_CONFIG_HOME/devices/$(hostname).rc" ]]; then +if [[ -x "$DTF_HOME/devices/$(hostname).rc" ]]; then dtf_log "Sourcing devices/$(hostname).rc" source $HOME/.config/dtfscripts/devices/$(hostname).rc fi @@ -98,7 +98,7 @@ function dtf_task_run() { dtf_log "Task is unexecutable: $task" exit 1 fi - source "$DTF_CONFIG_HOME/common_task.sh" + source "$DTF_HOME/common_task.sh" source "$task_full" ) } @@ -139,7 +139,7 @@ function dtf_service_start() { service_full="$DTF_SERVICES_DIR/$1" dtf_service_validate $1 || return 1 ( - source "$DTF_CONFIG_HOME/common_service.sh" + source "$DTF_HOME/common_service.sh" source "$service_full" isup && [[ "$service_kill_on_reload" == "true" ]] && stop prestart || exit 1 diff --git a/.config/dtfscripts/services/bspwm_sxhkd.dtf b/.dtfscripts/services/bspwm_sxhkd.dtf similarity index 100% rename from .config/dtfscripts/services/bspwm_sxhkd.dtf rename to .dtfscripts/services/bspwm_sxhkd.dtf diff --git a/.config/dtfscripts/services/compton.dtf b/.dtfscripts/services/compton.dtf similarity index 100% rename from .config/dtfscripts/services/compton.dtf rename to .dtfscripts/services/compton.dtf diff --git a/.config/dtfscripts/services/conky.dtf b/.dtfscripts/services/conky.dtf similarity index 100% rename from .config/dtfscripts/services/conky.dtf rename to .dtfscripts/services/conky.dtf diff --git a/.config/dtfscripts/services/dropbox.dtf b/.dtfscripts/services/dropbox.dtf similarity index 100% rename from .config/dtfscripts/services/dropbox.dtf rename to .dtfscripts/services/dropbox.dtf diff --git a/.config/dtfscripts/services/dunst.dtf b/.dtfscripts/services/dunst.dtf similarity index 100% rename from .config/dtfscripts/services/dunst.dtf rename to .dtfscripts/services/dunst.dtf diff --git a/.config/dtfscripts/services/plasmashell.dtf b/.dtfscripts/services/plasmashell.dtf similarity index 100% rename from .config/dtfscripts/services/plasmashell.dtf rename to .dtfscripts/services/plasmashell.dtf diff --git a/.config/dtfscripts/services/polybar.dtf b/.dtfscripts/services/polybar.dtf similarity index 100% rename from .config/dtfscripts/services/polybar.dtf rename to .dtfscripts/services/polybar.dtf diff --git a/.config/dtfscripts/services/redshift.dtf b/.dtfscripts/services/redshift.dtf similarity index 100% rename from .config/dtfscripts/services/redshift.dtf rename to .dtfscripts/services/redshift.dtf diff --git a/.config/dtfscripts/services/syncthing.dtf b/.dtfscripts/services/syncthing.dtf similarity index 100% rename from .config/dtfscripts/services/syncthing.dtf rename to .dtfscripts/services/syncthing.dtf diff --git a/.config/dtfscripts/tasks/bspwm.sh b/.dtfscripts/tasks/bspwm.sh similarity index 100% rename from .config/dtfscripts/tasks/bspwm.sh rename to .dtfscripts/tasks/bspwm.sh diff --git a/.config/dtfscripts/tasks/bspwm_monitorset.sh b/.dtfscripts/tasks/bspwm_monitorset.sh similarity index 100% rename from .config/dtfscripts/tasks/bspwm_monitorset.sh rename to .dtfscripts/tasks/bspwm_monitorset.sh diff --git a/.config/dtfscripts/tasks/kill_krunner.sh b/.dtfscripts/tasks/kill_krunner.sh similarity index 100% rename from .config/dtfscripts/tasks/kill_krunner.sh rename to .dtfscripts/tasks/kill_krunner.sh diff --git a/.config/dtfscripts/tasks/xrdbupdate.sh b/.dtfscripts/tasks/xrdbupdate.sh similarity index 100% rename from .config/dtfscripts/tasks/xrdbupdate.sh rename to .dtfscripts/tasks/xrdbupdate.sh diff --git a/.config/dtfscripts/tasks/xset.sh b/.dtfscripts/tasks/xset.sh similarity index 100% rename from .config/dtfscripts/tasks/xset.sh rename to .dtfscripts/tasks/xset.sh