diff options
| author | Robert Günzler <r@gnzler.io> | 2025-09-22 19:52:03 +0200 |
|---|---|---|
| committer | Robert Günzler <r@gnzler.io> | 2025-09-22 19:53:59 +0200 |
| commit | ded78d4e64f8aedc88ad1cad26ee7a1bcf531cb7 (patch) | |
| tree | 611459ad52b3aeeb9687e6c39ea7d20be2424704 | |
| parent | 0e1acdfd6dd48a3721b42cf1b168bd79f45051f2 (diff) | |
drop the need to have a dirs.conf
Signed-off-by: Robert Günzler <r@gnzler.io>
| -rwxr-xr-x | bin/svtree-run | 8 | ||||
| -rw-r--r-- | dirs.conf | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/bin/svtree-run b/bin/svtree-run index 521a2bc..e8d1422 100755 --- a/bin/svtree-run +++ b/bin/svtree-run @@ -3,7 +3,11 @@ importas -D "/etc" -S XDG_CONFIG_HOME importas -D "/run" -S XDG_RUNTIME_DIR -envfile -I /opt/svtree/dirs.conf +define STATE_DIR "${XDG_CONFIG_HOME}/s6-rc" +define LIVE_DIR "${XDG_RUNTIME_DIR}/s6-rc" +define SCAN_DIR "${XDG_RUNTIME_DIR}/service" +define SOURCE_DIR "${STATEDIR}/src" +define COMPILED_DIR "${STATEDIR}/compiled" # compile s6-rc db foreground { /opt/svtree/bin/svtree-compile } @@ -25,7 +29,7 @@ foreground { rm -rf ${SCAN_DIR} } foreground { elglob l ${LIVE_DIR}* rm -rf ${l} } # setup rundir -if { cp -va -- ${CONF_DIR}/run-image/service ${SCAN_DIR} } +if { cp -va -- ${STATE_DIR}/run-image/service ${SCAN_DIR} } background { # catch-all logger diff --git a/dirs.conf b/dirs.conf deleted file mode 100644 index b7eb11a..0000000 --- a/dirs.conf +++ /dev/null @@ -1,5 +0,0 @@ -STATE_DIR="${XDG_CONFIG_HOME}/s6-rc" -LIVE_DIR="${XDG_RUNTIME_DIR}/s6-rc" -SCAN_DIR="${XDG_RUNTIME_DIR}/service" -SOURCE_DIR="${STATEDIR}/src" -COMPILED_DIR="${STATEDIR}/compiled" |