Commit 42fd139
build,win: fix Python detection on localized OS
This code previously assumed the default value was always printed to
the console by reg.exe as "(default)", but this is not true on
localized versions of Windows and can contain spaces.
Fixes: #29417
PR-URL: #29423
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Reviewed-By: David Carlier <devnexen@gmail.com>1 parent 9de417a commit 42fd139
2 files changed
Lines changed: 11 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,2 +1,3 @@ | |||
| 1 | 1 | test/fixtures/* -text | |
| 2 | 2 | vcbuild.bat text eol=crlf | |
| 3 | + tools/msvs/find_python.cmd text eol=crlf | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -60,14 +60,16 @@ exit /b 1 | |||
| 60 | 60 | :: Read the InstallPath of a given Environment Key to %p% | |
| 61 | 61 | :: https://www.python.org/dev/peps/pep-0514/#installpath | |
| 62 | 62 | :read-installpath | |
| 63 | - :: %%a will receive token 3 | ||
| 64 | - :: %%b will receive *, corresponding to token 4 and all after | ||
| 65 | - for /f "skip=2 tokens=3*" %%a in ('reg query "%1\InstallPath" /ve /t REG_SZ 2^> nul') do ( | ||
| 66 | - set "head=%%a" | ||
| 67 | - set "tail=%%b" | ||
| 68 | - set "p=!head!" | ||
| 69 | - if not "!tail!"=="" set "p=!head! !tail!" | ||
| 70 | - exit /b 0 | ||
| 63 | + :: %%a will receive everything before ), might have spaces depending on language | ||
| 64 | + :: %%b will receive *, corresponding to everything after ) | ||
| 65 | + :: %%c will receive REG_SZ | ||
| 66 | + :: %%d will receive the path, including spaces | ||
| 67 | + for /f "skip=2 tokens=1* delims=)" %%a in ('reg query "%1\InstallPath" /ve /t REG_SZ 2^> nul') do ( | ||
| 68 | + for /f "tokens=1*" %%c in ("%%b") do ( | ||
| 69 | + if not "%%c"=="REG_SZ" exit /b 1 | ||
| 70 | + set "p=%%d" | ||
| 71 | + exit /b 0 | ||
| 72 | + ) | ||
| 71 | 73 | ) | |
| 72 | 74 | exit /b 1 | |
| 73 | 75 | ||
0 commit comments