From f4293a87aa2a654aba379bef58eaf7634634b267 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 4 Dec 2018 15:13:24 +0900 Subject: [PATCH] be nicer when parsing BTCPAYGEN_ADDITIONAL_FRAGMENTS --- docker-compose-generator/src/DockerComposition.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose-generator/src/DockerComposition.cs b/docker-compose-generator/src/DockerComposition.cs index b9c8f9d..8a924ed 100644 --- a/docker-compose-generator/src/DockerComposition.cs +++ b/docker-compose-generator/src/DockerComposition.cs @@ -41,7 +41,11 @@ namespace DockerGenerator } composition.SelectedProxy = (Environment.GetEnvironmentVariable("BTCPAYGEN_REVERSEPROXY") ?? "").ToLowerInvariant(); composition.SelectedLN = (Environment.GetEnvironmentVariable("BTCPAYGEN_LIGHTNING") ?? "").ToLowerInvariant(); - composition.AdditionalFragments = (Environment.GetEnvironmentVariable("BTCPAYGEN_ADDITIONAL_FRAGMENTS") ?? "").ToLowerInvariant().Split(';').Where(t => !string.IsNullOrWhiteSpace(t)).ToArray(); + composition.AdditionalFragments = (Environment.GetEnvironmentVariable("BTCPAYGEN_ADDITIONAL_FRAGMENTS") ?? "").ToLowerInvariant() + .Split(new char[] { ';' , ',' }) + .Where(t => !string.IsNullOrWhiteSpace(t)) + .Select(t => t.EndsWith(".yml") ? t.Substring(0, t.Length - ".yml".Length) : t) + .ToArray(); return composition; } }