Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Follow symlinks during find command execution for xcassets. #9425

Merged
merged 1 commit into from
Jan 7, 2020
Merged

Follow symlinks during find command execution for xcassets. #9425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* None.
* Fix resources script when building a project from a symlink.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#9423](https://github.com/CocoaPods/CocoaPods/issues/9423)


## 1.9.0.beta.2 (2019-12-17)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/copy_resources_script.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def script
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
OTHER_XCASSETS=$(find -L "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then
XCASSET_FILES+=("$line")
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Open in desktop
Submodule cocoapods-integration-specs updated 2 files
+1 −1 install_resources/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+1 −1 install_resources_no_source_files/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh