From 5d45dee686056663795c0dbea5a310d8950df2e4 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 15 Jun 2017 15:32:07 +0100 Subject: [PATCH] Fix Yarn tasks for Windows --- Make-MinGW.bat | 4 ++-- Make.bat | 4 ++-- web/regression/javascript/fake_endpoints.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Make-MinGW.bat b/Make-MinGW.bat index 87e77de55..811de6d72 100644 --- a/Make-MinGW.bat +++ b/Make-MinGW.bat @@ -166,9 +166,9 @@ REM Main function Ends IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% ECHO Install Javascript dependencies - yarn install + call yarn install ECHO Bundle all Javascript - yarn run bundle + call yarn run bundle XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% diff --git a/Make.bat b/Make.bat index 5ab69a7fb..499ebac25 100644 --- a/Make.bat +++ b/Make.bat @@ -240,9 +240,9 @@ REM Main function Ends IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% ECHO Install Javascript dependencies - yarn install + call yarn install ECHO Bundle all Javascript - yarn run bundle + call yarn run bundle XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% diff --git a/web/regression/javascript/fake_endpoints.js b/web/regression/javascript/fake_endpoints.js index 0cad103cd..2e072a1f7 100644 --- a/web/regression/javascript/fake_endpoints.js +++ b/web/regression/javascript/fake_endpoints.js @@ -8,5 +8,5 @@ ////////////////////////////////////////////////////////////////////////// define(function () { - return {'static': '/base/pgadmin/static/'} + return {'static': '/base/pgadmin/static/'}; });