Make VMR sync work on macOS 12, hopefully

This commit is contained in:
Jo Shields 2023-12-08 15:51:29 -05:00
parent 50bd7e3a26
commit 38f4b80a0e

View file

@ -94,8 +94,8 @@ function highlight () {
echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}"
} }
echo "*** DEBUG $(which realpath)" # realpath is not available in macOS 12, try horrible-but-portable workaround
installer_dir=$(realpath "$scriptroot/../") installer_dir=$(cd "$scriptroot/../"; pwd -P)
tmp_dir='' tmp_dir=''
vmr_dir='' vmr_dir=''
@ -239,7 +239,8 @@ set -e
highlight 'Installing .NET, preparing the tooling..' highlight 'Installing .NET, preparing the tooling..'
source "$scriptroot/common/tools.sh" source "$scriptroot/common/tools.sh"
InitializeDotNetCli true InitializeDotNetCli true
dotnet=$(realpath "$scriptroot/../.dotnet/dotnet") dotnetDir=$( cd $scriptroot/../.dotnet/; pwd -P )
dotnet=$dotnetDir/dotnet
"$dotnet" tool restore "$dotnet" tool restore
highlight "Starting the synchronization of '$repository'.." highlight "Starting the synchronization of '$repository'.."