From 5e78b50f3de5c99f469f679ad11d794526d6cd8f Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Fri, 23 Sep 2016 07:16:09 -0700 Subject: [PATCH] Remove the dependency of using config.json in cwd (#7330) Currently the config.json file is looked for in the current working directory. This change forces run.exe to use the relative path of the file relative to the build script. --- run.cmd | 6 +++--- run.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/run.cmd b/run.cmd index 3647198..710f50c 100644 --- a/run.cmd +++ b/run.cmd @@ -30,10 +30,10 @@ if NOT [%ERRORLEVEL%]==[0] ( set _toolRuntime=%~dp0Tools set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe -echo Running: %_dotnet% %_toolRuntime%\run.exe %* -call %_dotnet% %_toolRuntime%\run.exe %* +echo Running: %_dotnet% %_toolRuntime%\run.exe %~dp0config.json %* +call %_dotnet% %_toolRuntime%\run.exe %~dp0config.json %* if NOT [%ERRORLEVEL%]==[0] ( exit /b 1 ) -exit /b 0 \ No newline at end of file +exit /b 0 diff --git a/run.sh b/run.sh index 1c9299a..bd6a68f 100755 --- a/run.sh +++ b/run.sh @@ -8,8 +8,8 @@ $working_tree_root/init-tools.sh toolRuntime=$working_tree_root/Tools dotnet=$toolRuntime/dotnetcli/dotnet -echo "Running: $dotnet $toolRuntime/run.exe $*" -$dotnet $toolRuntime/run.exe $* +echo "Running: $dotnet $toolRuntime/run.exe $working_tree_root/config.json $*" +$dotnet $toolRuntime/run.exe $working_tree_root/config.json $* if [ $? -ne 0 ] then echo "ERROR: An error occured in $dotnet $toolRuntime/run $#. Check $# logs under $working_tree_root." -- 2.7.4