From e183844df548917fc666a82d728f2fe293c388ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Thu, 19 Jul 2018 05:01:23 -0700 Subject: [PATCH] Uniformizes how THIS_DIR is computed in xplat/js Summary: This form of THIS_DIR resolves symlinks, which is better. Reviewed By: davidaurelio Differential Revision: D8661886 fbshipit-source-id: 90bf329e765d9623d103b03c5dd3b71fae9d9854 --- IntegrationTests/launchWebSocketServer.command | 4 ++-- runXcodeTests.sh | 4 ++-- scripts/launchPackager.command | 4 ++-- scripts/packager.sh | 4 ++-- scripts/run-android-emulator.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/IntegrationTests/launchWebSocketServer.command b/IntegrationTests/launchWebSocketServer.command index a6531c5f8..445f3fc0f 100755 --- a/IntegrationTests/launchWebSocketServer.command +++ b/IntegrationTests/launchWebSocketServer.command @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright (c) 2015-present, Facebook, Inc. # @@ -9,7 +9,7 @@ echo -en "\033]0;Web Socket Test Server\a" clear -THIS_DIR=$(dirname "$0") +THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) pushd "$THIS_DIR" ./websocket_integration_test_server.js popd diff --git a/runXcodeTests.sh b/runXcodeTests.sh index b1b6e7f4f..9b9b00b99 100755 --- a/runXcodeTests.sh +++ b/runXcodeTests.sh @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # This script should be run from the react-native root -THIS_DIR=$(dirname "$0") +THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) source "scripts/.tests.env" if [ -n "$1" ] diff --git a/scripts/launchPackager.command b/scripts/launchPackager.command index b4570cd3c..f8146dcf9 100755 --- a/scripts/launchPackager.command +++ b/scripts/launchPackager.command @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright (c) 2015-present, Facebook, Inc. # @@ -9,7 +9,7 @@ echo -en "\033]0;Metro Bundler\a" clear -THIS_DIR=$(dirname "$0") +THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) . "$THIS_DIR/packager.sh" echo "Process terminated. Press to close the window" diff --git a/scripts/packager.sh b/scripts/packager.sh index ee3966923..1d33bf557 100755 --- a/scripts/packager.sh +++ b/scripts/packager.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright (c) 2015-present, Facebook, Inc. # # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -THIS_DIR=$(dirname "$0") +THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) source "${THIS_DIR}/.packager.env" cd "$THIS_DIR/.." node "./local-cli/cli.js" start "$@" diff --git a/scripts/run-android-emulator.sh b/scripts/run-android-emulator.sh index d7307120b..d2c6390d9 100755 --- a/scripts/run-android-emulator.sh +++ b/scripts/run-android-emulator.sh @@ -6,7 +6,7 @@ # virtual device configuration. # This is useful for running integration tests on a local machine. -THIS_DIR=$(dirname "$0") +THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) STATE=`adb get-state`