Commit 6998ed24 authored by Seán Labastille's avatar Seán Labastille Committed by Samuel E. Giddins

Escape resource bundle names and enable environment variable expansion

parent 0505ce41
......@@ -76,7 +76,7 @@ module Pod
unless resources.empty?
script += %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
resources.each do |resource|
script += " install_resource '#{resource}'\n"
script += %( install_resource "#{resource}"\n)
end
script += "fi\n"
end
......
......@@ -118,7 +118,7 @@ module Pod
target.user_build_configurations.keys.each do |config|
file_accessors = library_targets.select { |t| t.include_in_build_config?(config) }.flat_map(&:file_accessors)
resource_paths = file_accessors.flat_map { |accessor| accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) } }
resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }
resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{Shellwords.shellescape(name)}.bundle" } }
resources_by_config[config] = resource_paths + resource_bundles
resources_by_config[config] << bridge_support_file if bridge_support_file
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment