Commit 08d3a04b authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3756 from CocoaPods/seg-embed-frameworks-quotes

[EmbedFrameworksScript] Quote all the things
parents aa4994a6 119c8c76
...@@ -33,6 +33,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -33,6 +33,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Vincent Isambart](https://github.com/vincentisambart) [Vincent Isambart](https://github.com/vincentisambart)
[#3751](https://github.com/CocoaPods/CocoaPods/issues/3751) [#3751](https://github.com/CocoaPods/CocoaPods/issues/3751)
* Properly support targets with spaces in their name in the embed frameworks
script.
[Samuel Giddins](https://github.com/segiddins)
[#3754](https://github.com/CocoaPods/CocoaPods/issues/3754)
## 0.38.0.beta.1 ## 0.38.0.beta.1
##### Highlighted Enhancement That Needs Testing ##### Highlighted Enhancement That Needs Testing
......
...@@ -55,11 +55,11 @@ module Pod ...@@ -55,11 +55,11 @@ module Pod
if [ -L "${source}" ]; then if [ -L "${source}" ]; then
echo "Symlinked..." echo "Symlinked..."
source=$(readlink "${source}") source="$(readlink "${source}")"
fi fi
# use filter instead of exclude so missing patterns dont' throw errors # use filter instead of exclude so missing patterns dont' throw errors
echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" ${source} ${destination}" echo "rsync -av --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${destination}\\""
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
# Resign the code if required by the build settings to avoid unstable apps # Resign the code if required by the build settings to avoid unstable apps
...@@ -67,7 +67,7 @@ module Pod ...@@ -67,7 +67,7 @@ module Pod
# Embed linked Swift runtime libraries # Embed linked Swift runtime libraries
local basename local basename
basename=$(basename $1 | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]}) basename="$(basename "$1" | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]})"
local swift_runtime_libs local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u && exit ${PIPESTATUS[0]}) swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do for lib in $swift_runtime_libs; do
...@@ -82,7 +82,7 @@ module Pod ...@@ -82,7 +82,7 @@ module Pod
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy # Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1" echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \\"$1\\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
fi fi
} }
......
Subproject commit f957d7bef1b92e6cc3ec00c63d06dc2fefa220f6 Subproject commit 6d4b38764f551fcda4da634ba777640d96162b56
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