Skip to content

Commit 5dbf362

Browse files
Merge pull request #603 from mcottontensor/backport/LatencyTest/pr-595
[LatencyTest] Fixing path setup in the windows platform scripts. (#594) (#595)
2 parents 5a82cbb + 9b6120d commit 5dbf362

File tree

1 file changed

+6
-6
lines changed
  • SignallingWebServer/platform_scripts/cmd

1 file changed

+6
-6
lines changed

SignallingWebServer/platform_scripts/cmd/common.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,13 @@ if exist node\ (
140140
set INSTALL_DEPS=1
141141
)
142142

143+
rem NOTE: We want to use our NodeJS (not system NodeJS!) to build the web frontend files.
144+
rem Save our current directory (the NodeJS dir) in a variable
145+
set NODE_DIR=%SCRIPT_DIR%node
146+
set PATH=%NODE_DIR%;%PATH%
147+
143148
rem Print node version
144-
FOR /f %%A IN ('node\node.exe -v') DO set NODE_VERSION=%%A
149+
FOR /f %%A IN ('node.exe -v') DO set NODE_VERSION=%%A
145150
echo Node version: %NODE_VERSION%
146151
popd
147152

@@ -189,10 +194,6 @@ exit /b
189194
rem Start in the repo dir
190195
pushd %SCRIPT_DIR%..\..\..\
191196

192-
rem NOTE: We want to use our NodeJS (not system NodeJS!) to build the web frontend files.
193-
rem Save our current directory (the NodeJS dir) in a variable
194-
set NODE_DIR=%SCRIPT_DIR%node
195-
196197
IF "%FRONTEND_DIR%"=="" (
197198
set FRONTEND_DIR="%SCRIPT_DIR%..\..\www"
198199
) else (
@@ -210,7 +211,6 @@ IF NOT exist "%FRONTEND_DIR%" (
210211
set BUILD_FRONTEND=1
211212
)
212213

213-
set PATH=%NODE_DIR%;%PATH%
214214

215215
IF "%BUILD_FRONTEND%"=="1" (
216216
rem We could replace this all with a single npm script that does all this. we do have several build-all scripts already

0 commit comments

Comments
 (0)