Skip to content

Commit

Permalink
Follow symlinks during find command execution for xcassets.
Browse files Browse the repository at this point in the history
  • Loading branch information
dnkoutso committed Jan 7, 2020
1 parent f4f64da commit 714a683
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
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
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

0 comments on commit 714a683

Please sign in to comment.