From 3ec595ac0584fd4dfbc99d17a4eee677a01c81ad Mon Sep 17 00:00:00 2001 From: William Belcher Date: Thu, 16 Nov 2023 15:11:05 +1000 Subject: [PATCH] Update platform scripts so that the BASH_LOCATION works on Mac as well --- Matchmaker/platform_scripts/bash/run.sh | 2 +- Matchmaker/platform_scripts/bash/setup.sh | 2 +- SFU/platform_scripts/bash/run_cloud.sh | 2 +- SFU/platform_scripts/bash/run_local.sh | 2 +- SFU/platform_scripts/bash/setup.sh | 2 +- .../platform_scripts/bash/Start_SignallingServer.sh | 2 +- SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh | 2 +- .../platform_scripts/bash/Start_WithTURN_SignallingServer.sh | 2 +- .../platform_scripts/bash/docker-build-cirrus.sh | 2 +- SignallingWebServer/platform_scripts/bash/run_local.sh | 2 +- SignallingWebServer/platform_scripts/bash/setup.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Matchmaker/platform_scripts/bash/run.sh b/Matchmaker/platform_scripts/bash/run.sh index 3e254b44..a88c7684 100755 --- a/Matchmaker/platform_scripts/bash/run.sh +++ b/Matchmaker/platform_scripts/bash/run.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/Matchmaker/platform_scripts/bash/setup.sh b/Matchmaker/platform_scripts/bash/setup.sh index 3cd60d23..2bf5735a 100755 --- a/Matchmaker/platform_scripts/bash/setup.sh +++ b/Matchmaker/platform_scripts/bash/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SFU/platform_scripts/bash/run_cloud.sh b/SFU/platform_scripts/bash/run_cloud.sh index ee24da7d..67ff79d0 100755 --- a/SFU/platform_scripts/bash/run_cloud.sh +++ b/SFU/platform_scripts/bash/run_cloud.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SFU/platform_scripts/bash/run_local.sh b/SFU/platform_scripts/bash/run_local.sh index feb26e0f..2b816813 100755 --- a/SFU/platform_scripts/bash/run_local.sh +++ b/SFU/platform_scripts/bash/run_local.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SFU/platform_scripts/bash/setup.sh b/SFU/platform_scripts/bash/setup.sh index 1c77f412..85340a70 100755 --- a/SFU/platform_scripts/bash/setup.sh +++ b/SFU/platform_scripts/bash/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh b/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh index af182b26..9f949e71 100755 --- a/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh +++ b/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh b/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh index f1d04309..a1f1c774 100755 --- a/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh +++ b/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh b/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh index 40f83de1..1174d508 100755 --- a/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh +++ b/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh b/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh index dc0a5fb0..00c3f37a 100755 --- a/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh +++ b/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/run_local.sh b/SignallingWebServer/platform_scripts/bash/run_local.sh index dff8e9d0..cfb80938 100755 --- a/SignallingWebServer/platform_scripts/bash/run_local.sh +++ b/SignallingWebServer/platform_scripts/bash/run_local.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" pushd "${BASH_LOCATION}" > /dev/null diff --git a/SignallingWebServer/platform_scripts/bash/setup.sh b/SignallingWebServer/platform_scripts/bash/setup.sh index dee1c1bd..b0da33be 100755 --- a/SignallingWebServer/platform_scripts/bash/setup.sh +++ b/SignallingWebServer/platform_scripts/bash/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright Epic Games, Inc. All Rights Reserved. -BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +BASH_LOCATION="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" NODE_VERSION=v18.17.0 pushd "${BASH_LOCATION}" > /dev/null