Skip to content

Commit

Permalink
Uniformizes how THIS_DIR is computed in xplat/js
Browse files Browse the repository at this point in the history
Summary: This form of THIS_DIR resolves symlinks, which is better.

Reviewed By: davidaurelio

Differential Revision: D8661886

fbshipit-source-id: 90bf329e765d9623d103b03c5dd3b71fae9d9854
  • Loading branch information
Maël Nison authored and facebook-github-bot committed Jul 19, 2018
1 parent b9d1c83 commit e183844
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions IntegrationTests/launchWebSocketServer.command
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

# Copyright (c) 2015-present, Facebook, Inc.
#
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions runXcodeTests.sh
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
4 changes: 2 additions & 2 deletions scripts/launchPackager.command
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

# Copyright (c) 2015-present, Facebook, Inc.
#
Expand All @@ -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 <enter> to close the window"
Expand Down
4 changes: 2 additions & 2 deletions scripts/packager.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion scripts/run-android-emulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down

0 comments on commit e183844

Please sign in to comment.