libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Improve quoting and variable parsing for batch start script. (#20212)

Browse source 
Quote some specific variables used in the batch script to address blank
space issues when Keycloak is in a directory structure containing
spaces.

Address some variable parsing issues by using delayed expansion instead
of default behavior.

Remove superfluous SetLocal EnableDelayedExpansion

Closes keycloak/keycloak#20115
This commit is contained in:
Joshua Sorah 2023-10-20 12:11:47 -04:00 committed by GitHub
parent 829b7090fa
commit 1837b4401c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
quarkus/dist/src/main/content/bin/kc.bat vendored
View file

@ -138,9 +138,9 @@ if "x%JAVA%" == "x" (
)
)
set "CLASSPATH_OPTS=%DIRNAME%..\lib\quarkus-run.jar"
set CLASSPATH_OPTS="%DIRNAME%..\lib\quarkus-run.jar"
set JAVA_RUN_OPTS=%JAVA_OPTS% -Dkc.home.dir=%DIRNAME%.. -Djboss.server.config.dir=%DIRNAME%..\conf -Dkeycloak.theme.dir=%DIRNAME%..\themes %SERVER_OPTS% -cp %CLASSPATH_OPTS% io.quarkus.bootstrap.runner.QuarkusEntryPoint %CONFIG_ARGS%
set JAVA_RUN_OPTS=%JAVA_OPTS% -Dkc.home.dir="%DIRNAME%.." -Djboss.server.config.dir="%DIRNAME%..\conf" -Dkeycloak.theme.dir="%DIRNAME%..\themes" %SERVER_OPTS% -cp %CLASSPATH_OPTS% io.quarkus.bootstrap.runner.QuarkusEntryPoint %CONFIG_ARGS%
SetLocal EnableDelayedExpansion
@ -156,14 +156,13 @@ if not errorlevel == 1 (
)
if "%PRINT_ENV%" == "true" (
echo "Using JAVA_OPTS: %JAVA_OPTS%"
echo "Using JAVA_OPTS: !JAVA_OPTS!"
echo "Using JAVA_RUN_OPTS: !JAVA_RUN_OPTS!"
)
set START_SERVER=true
if "!CONFIG_ARGS:%OPTIMIZED_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%BUILD_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%HELP_LONG_OPTION%=!"=="!CONFIG_ARGS!" if "%IS_HELP_SHORT%" == "false" (
setlocal enabledelayedexpansion
"%JAVA%" -Dkc.config.build-and-exit=true !JAVA_RUN_OPTS!