mirrors/brigadier
1
0
Fork 0
mirror of https://github.com/timsutton/brigadier.git synced 2025-06-06 01:31:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update brigadier.bat

Browse source
This commit is contained in:
CorpNewt 2020-07-07 19:11:14 -05:00 • committed by GitHub
parent 620c294610
commit 2a0aafe45a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brigadier.bat
View file

@ -103,7 +103,7 @@ REM Remove double semicolons from the adjusted PATH
call :undouble "PATH" ";" call :undouble "PATH" ";"
goto :EOF goto :EOF
:undouble <string_name> <character> :undouble - string_name character
REM Helper function to strip doubles of a single character out of a string recursively REM Helper function to strip doubles of a single character out of a string recursively
set "string_name=%~1" set "string_name=%~1"
set "character=%~2" set "character=%~2"
@ -164,7 +164,7 @@ if "!pypath!" == "" (
) )
goto runscript goto runscript
:checkpyversion <path> <py2v> <py2path> <py3v> <py3path> :checkpyversion - path py2v py2path py3v py3path
set "version="&for /f "tokens=2* USEBACKQ delims= " %%a in (`"%~1" -V 2^>^&1`) do ( set "version="&for /f "tokens=2* USEBACKQ delims= " %%a in (`"%~1" -V 2^>^&1`) do (
REM Ensure we have a version number REM Ensure we have a version number
call :isnumber "%%a" call :isnumber "%%a"
@ -189,12 +189,12 @@ if "!version:~0,1!" == "2" (
) )
goto :EOF goto :EOF
:isnumber <check> :isnumber - check_value
set "var="&for /f "delims=0123456789." %%i in ("%~1") do set var=%%i set "var="&for /f "delims=0123456789." %%i in ("%~1") do set var=%%i
if defined var (exit /b 1) if defined var (exit /b 1)
exit /b 0 exit /b 0
:comparepyversion <version1> <version2> <return> :comparepyversion - version1 version2 return
REM Exits with status 0 if equal, 1 if v1 gtr v2, 2 if v1 lss v2 REM Exits with status 0 if equal, 1 if v1 gtr v2, 2 if v1 lss v2
for /f "tokens=1,2,3 delims=." %%a in ("%~1") do ( for /f "tokens=1,2,3 delims=." %%a in ("%~1") do (
set a1=%%a set a1=%%a