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.
dotnet · 5e78b50f3de5c99f469f679ad11d794526d6cd8f · jashook committed with jkotas Sep 23, 2016 · Sep 23, 2016 · 5e78b50
1 parent 43efdc6
commit 5e78b50f3de5c99f469f679ad11d794526d6cd8f
Unified Split

Showing with 5 additions and 5 deletions.

+3 −3 run.cmd

+2 −2 run.sh
diff --git 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
+exit /b 0
diff --git 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."