From 95d5d112acb452c6cacf23d2e2b3d56110f4fefd Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Sun, 6 Aug 2017 20:18:50 -0700 Subject: [PATCH] Fixed issue with install third party script in directory with spaces Summary: Fixes an issue with installing third party on iOS when the project's path contains a space, no matter where the space is in the path. __Error__ ``` /Users/AwesomeUser/Library/Developer/Xcode/DerivedData/AwesomeProject-xxx/Build/Intermediates.noindex/React.build/Debug-iphoneos/double-conversion.build/Script-190EE32F1E6A43DE00A8543A.sh: line 3: /Users/AwesomeUser/path contain space/scripts/ios-install-third-party.sh: No such file or directory /Users/AwesomeUser/Library/Developer/Xcode/DerivedData/AwesomeProject-xxx/Build/Intermediates.noindex/React.build/Debug-iphoneos/double-conversion.build/Script-190EE32F1E6A43DE00A8543A.sh: line 3: exec: /Users/AwesomeUser/path contain space/scripts/ios-install-third-party.sh: cannot execute: No such file or directory ``` Closes https://github.com/facebook/react-native/pull/15377 Differential Revision: D5572671 Pulled By: shergin fbshipit-source-id: 102727fc1b820e399e170c9c0cb73fd5d1e018d5 --- React/React.xcodeproj/project.pbxproj | 2 +- scripts/ios-install-third-party.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 2f5e9553e..5cd7e7eac 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -3491,7 +3491,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd $SRCROOT/..\nexec ./scripts/ios-install-third-party.sh"; + shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh"; }; 2D6948201DA3042200B3FA97 /* Include RCTJSCProfiler */ = { isa = PBXShellScriptBuildPhase; diff --git a/scripts/ios-install-third-party.sh b/scripts/ios-install-third-party.sh index 2aabd7fe8..271a35348 100755 --- a/scripts/ios-install-third-party.sh +++ b/scripts/ios-install-third-party.sh @@ -33,7 +33,7 @@ mkdir -p third-party SCRIPTDIR=$(dirname "$0") -fetch_and_unpack glog-0.3.4.tar.gz https://github.com/google/glog/archive/v0.3.4.tar.gz "$SCRIPTDIR/ios-configure-glog.sh" +fetch_and_unpack glog-0.3.4.tar.gz https://github.com/google/glog/archive/v0.3.4.tar.gz "\"$SCRIPTDIR/ios-configure-glog.sh\"" fetch_and_unpack double-conversion-1.1.5.tar.gz https://github.com/google/double-conversion/archive/v1.1.5.tar.gz fetch_and_unpack boost_1_63_0.tar.gz https://github.com/react-native-community/boost-for-react-native/releases/download/v1.63.0-0/boost_1_63_0.tar.gz fetch_and_unpack folly-2016.09.26.00.tar.gz https://github.com/facebook/folly/archive/v2016.09.26.00.tar.gz