From 6dc69228f20b3566320b52966b3782d633171e71 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 27 Nov 2017 20:35:14 -0500 Subject: 0.20.2 paths, config & manifest files --- org/meta_read_source_files.org | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'org/meta_read_source_files.org') diff --git a/org/meta_read_source_files.org b/org/meta_read_source_files.org index 5e32b1f..6b44dfb 100644 --- a/org/meta_read_source_files.org +++ b/org/meta_read_source_files.org @@ -21,6 +21,7 @@ #+BEGIN_SRC d import sdp.meta, + sdp.output.paths_source, std.file, std.path; #+END_SRC @@ -47,29 +48,7 @@ module sdp.meta.read_config_files; static template configIn() { <> final string configIn(C,E)(C conf_sdl, E env) { - /+ FIX clean up conf paths ↓ +/ - string sisudoc_conf_pwd = chainPath(to!string(env["pwd"]), "sisudoc/conf").array; - string sisudoc_conf_pwd_a = chainPath(to!string(env["pwd"]), "conf").array; - string sisudoc_conf_pwd_b = chainPath(to!string(env["pwd"]), "../conf").array; - string sisudoc_conf_pwd_c = chainPath(to!string(env["pwd"]), "../../conf").array; - string sisudoc_conf_pwd_d = chainPath(to!string(env["pwd"]), "../../../conf").array; - /+ FIX clean up conf paths ↑ - (compare pwd to doc path location, and build config path) - +/ - string dot_pwd = chainPath(to!string(env["pwd"]), ".sisu").array; - string underscore_pwd = chainPath(to!string(env["pwd"]), "_sisu").array; - string dot_home = chainPath(to!string(env["home"]), ".sisu").array; - string[] possible_config_path_locations = [ - sisudoc_conf_pwd, - sisudoc_conf_pwd_a, - sisudoc_conf_pwd_b, - sisudoc_conf_pwd_c, - sisudoc_conf_pwd_d, - dot_pwd, - underscore_pwd, - dot_home, - "/etc/sisu" - ]; + auto possible_config_path_locations = ConfigFilePaths!()(env).possible_config_path_locations; string config_file_str; foreach(pth; possible_config_path_locations) { auto conf_file = format( -- cgit v1.2.3