From ded78d4e64f8aedc88ad1cad26ee7a1bcf531cb7 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Mon, 22 Sep 2025 19:52:03 +0200 Subject: drop the need to have a dirs.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Günzler --- bin/svtree-run | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/svtree-run') 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 -- cgit 1.4.1