From f40dbccc1fa31611ffd3cd17bde1419ea7212bc6 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Thu, 24 Oct 2019 00:41:55 +0200 Subject: [PATCH] Template directories are Makefile-configured. --- src/config.cr.in | 2 ++ src/gen-config.cr | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/config.cr.in b/src/config.cr.in index 2610078..d375c60 100644 --- a/src/config.cr.in +++ b/src/config.cr.in @@ -5,6 +5,8 @@ RC_DIRECTORY = "@SYSCONFDIR@/rc/services" LOG_DIRECTORY = "@VARSTATEDIR@/log" SERVICES_DIRECTORY = "@SHAREDIR@/services" ENVIRONMENTS_DIRECTORY = "@SYSCONFDIR@/rc/environments" +SYSTEM_CONFIGURATION_DIRECTORY = "@SYSCONFDIR@" +SHARED_DATA_DIRECTORY = "@SHAREDIR@" OWN_LIBEXEC_DIR = "@LIBEXECDIR@/service" CACHE_DIRECTORY = "@VARSTATEDIR@/cache" diff --git a/src/gen-config.cr b/src/gen-config.cr index d4498c0..11c2c19 100644 --- a/src/gen-config.cr +++ b/src/gen-config.cr @@ -1,5 +1,7 @@ require "crinja" +require "./config.cr" + def sanitize_path(path) path.gsub /\/\/+/, "/" end @@ -41,11 +43,9 @@ class Configure::Context def generate(template, target : String, options : Hash(String, String | Array(String) | Crinja::Callable::Instance | Hash(String, String))) target_file = File.open target, "w" - # FIXME: Alter default sources at build-time. - # FIXME: We’ll want a way to alter those context-wide. sources = [ - "/etc/templates", - "/usr/share/templates" + "#{SYSTEM_CONFIGURATION_DIRECTORY}/templates", + "#{SHARED_DATA_DIRECTORY}/templates" ] sources = sources