From e2bbed8acc1f1cf498a0085cf771cf9bf40fb709 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Thu, 24 Sep 2020 10:50:19 +0200 Subject: Fix django highlighting, fixes #553 --- scripts/build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/build b/scripts/build index 47a7e51a..260beddb 100755 --- a/scripts/build +++ b/scripts/build @@ -375,13 +375,15 @@ def extract(packages) if repo == "vim/vim" && (["glob", "globs"] & package.keys).size == 0 raise "Package from vim/vim should define glob or globs: #{package["name"]}" end - glob = package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}')) - Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p| - next unless File.file?("#{subtree}/#{p}") - if p.include?("samba") - raise package["name"] + globs = [package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))].flatten + globs.each do |glob| + Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p| + next unless File.file?("#{subtree}/#{p}") + if p.include?("samba") + raise package["name"] + end + copy_file(package, "#{subtree}/#{p}", p) end - copy_file(package, "#{subtree}/#{p}", p) end elsif File.exist?(subpath) copy_file(package, subpath, subdir) -- cgit v1.2.3