ralsina/faaso
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Cleanup, less brittle

Browse Source
This commit is contained in:
Roberto Alsina 2024-07-05 17:09:57 -03:00
parent fc55f19660
commit 8efab6b5f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime.cr
View File

@ -27,11 +27,12 @@ module Runtime
elsif File.exists? runtime elsif File.exists? runtime
Log.info { "Using directory #{runtime} as runtime" } Log.info { "Using directory #{runtime} as runtime" }
runtime_base = "#{runtime}" runtime_base = "#{runtime}"
runtime_files = Dir.glob("#{runtime_base}/**/*") runtime_files = Dir.glob("#{runtime_base}/**/*").select { |file| File.file?(file) }
runtime_files = runtime_files.map { |file| Path[file].normalize.to_s }
else else
raise Exception.new("Can't find runtime #{runtime}") raise Exception.new("Can't find runtime #{runtime}")
end end
{runtime_base, runtime_files.reject(&.starts_with? "#{runtime_base}template")} {runtime_base, runtime_files.reject(&.starts_with? Path[runtime_base, "template"].normalize.to_s)}
end end
def self.template_files(runtime : String) : {String, Array(String)} def self.template_files(runtime : String) : {String, Array(String)}
@ -44,7 +45,8 @@ module Runtime
elsif File.exists? runtime elsif File.exists? runtime
Log.info { "Using directory #{runtime} as runtime" } Log.info { "Using directory #{runtime} as runtime" }
template_base = "#{runtime}/template" template_base = "#{runtime}/template"
template_files = Dir.glob("#{template_base}/**/*") template_files = Dir.glob("#{template_base}/**/*").select { |file| File.file?(file) }
template_files = template_files.map { |file| Path[file].normalize.to_s }
else else
raise Exception.new("Can't find runtime #{runtime}") raise Exception.new("Can't find runtime #{runtime}")
end end