lib/kameleon/utils.rb in kameleon-builder-2.7.3 vs lib/kameleon/utils.rb in kameleon-builder-2.7.4
- old
+ new
@@ -17,10 +17,10 @@
def self.resolve_data_dir_vars(raw, yaml_path, initial_variables, recipe, kwargs)
raw.to_s.scan(/\$\$kameleon\_data\_dir\/(.*)/) do |var|
warn_var(var)
end
- reg = %r/\$\$kameleon\_data\_dir\/(.*)|\$\${kameleon\_data\_dir}\/(.*)/
+ reg = %r/\$\$kameleon\_data\_dir|\$\${kameleon\_data\_dir}(.*)/
matches = raw.to_enum(:scan, reg).map { Regexp.last_match }
matches.each do |m|
unless m.nil?
path = resolve_simple_vars(m[1], yaml_path, initial_variables, kwargs)
resolved_path = recipe.resolve_data_path(path.chomp('"'), yaml_path)