From 1ab3a8a985e9cb2bc63e362336e2275cb6032784 Mon Sep 17 00:00:00 2001 From: Scott Kyle Date: Fri, 19 Feb 2016 02:03:54 -0800 Subject: [PATCH] No longer delete before npm installing local modules This doesn't appear to have been necessary and seems to sometimes cause an issue because the packager will start and look for a JS file that was just deleted. --- .../ReactExample/ios/ReactExample.xcodeproj/project.pbxproj | 2 +- examples/ReactExample/run-android.sh | 1 - examples/ReactNativeBenchmarks/run-android.sh | 1 - tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj | 2 +- tests/react-test-app/run-android.sh | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj index 4a7a9dfa..164353d3 100644 --- a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj +++ b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj @@ -635,7 +635,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -rf ../node_modules/realm\n[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\"\nnpm install realm"; + shellScript = "[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\"\nnpm install realm"; }; F6C465131C48706400E79896 /* Bundle React Native code and images */ = { isa = PBXShellScriptBuildPhase; diff --git a/examples/ReactExample/run-android.sh b/examples/ReactExample/run-android.sh index 4f645e7e..d7f00b63 100755 --- a/examples/ReactExample/run-android.sh +++ b/examples/ReactExample/run-android.sh @@ -5,7 +5,6 @@ set -e PATH="/opt/android-sdk-linux/platform-tools:$PATH" -rm -rf node_modules/realm npm install realm adb reverse tcp:8081 tcp:8081 diff --git a/examples/ReactNativeBenchmarks/run-android.sh b/examples/ReactNativeBenchmarks/run-android.sh index 4f645e7e..d7f00b63 100755 --- a/examples/ReactNativeBenchmarks/run-android.sh +++ b/examples/ReactNativeBenchmarks/run-android.sh @@ -5,7 +5,6 @@ set -e PATH="/opt/android-sdk-linux/platform-tools:$PATH" -rm -rf node_modules/realm npm install realm adb reverse tcp:8081 tcp:8081 diff --git a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj index bec981ec..a0b82dad 100644 --- a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj +++ b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj @@ -615,7 +615,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\" \nrm -rf ../node_modules/realm ../node_modules/realm-tests\nnpm install realm realm-tests\ncp ../../../src/object-store/parser/queryTests.json ../node_modules/realm-tests/query-tests.json\n"; + shellScript = "[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\" \nnpm install realm realm-tests\ncp ../../../src/object-store/parser/queryTests.json ../node_modules/realm-tests/query-tests.json\n"; }; F6EDE5BF1C49007200B1085F /* Bundle React Native code and images */ = { isa = PBXShellScriptBuildPhase; diff --git a/tests/react-test-app/run-android.sh b/tests/react-test-app/run-android.sh index 122e69a4..febe3497 100755 --- a/tests/react-test-app/run-android.sh +++ b/tests/react-test-app/run-android.sh @@ -5,7 +5,6 @@ set -e PATH="/opt/android-sdk-linux/platform-tools:$PATH" -rm -rf node_modules/realm node_modules/realm-tests npm install realm realm-tests cp ../../src/object-store/parser/queryTests.json node_modules/realm-tests/query-tests.json