libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

kcadm.bat, kcreg.bat do not respect environment variables JAVA, JAVA_… (#23630)

Browse source 
* kcadm.bat, kcreg.bat do not respect environment variables JAVA, JAVA_HOME to select JVM

* edited kcadm.bat and kcreg.bat scripts

Closes #23214

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>

* kcadm.bat, kcreg.bat do not respect environment variables JAVA, JAVA_HOME to select JVM

* incorporated suggestions

Closes #23214

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>

* kcadm.bat, kcreg.bat do not respect environment variables JAVA, JAVA_HOME to select JVM

* incorporated suggestions

Closes #23214

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>

---------

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>
This commit is contained in:
Peter Zaoral 2023-10-20 15:51:54 +02:00 committed by GitHub
parent c18e8ff535
commit f2dc57bfe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 62 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
integration/client-cli/admin-cli/src/main/bin/kcadm.bat
View file

@ -5,4 +5,26 @@ if "%OS%" == "Windows_NT" (
) else ( ) else (
set DIRNAME=.\ set DIRNAME=.\
) )
java %KC_OPTS% -cp "%DIRNAME%\client\keycloak-admin-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.admin.cli.KcAdmMain %*
if "x%JAVA%" == "x" (
if "x%JAVA_HOME%" == "x" (
set JAVA=java
echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
) else (
if not exist "%JAVA_HOME%" (
echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
goto END
) else (
if not exist "%JAVA_HOME%\bin\java.exe" (
echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
goto END
)
set "JAVA=%JAVA_HOME%\bin\java"
)
)
)
"%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-admin-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.admin.cli.KcAdmMain %*
:END

24
integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat
View file

@ -5,4 +5,26 @@ if "%OS%" == "Windows_NT" (
) else ( ) else (
set DIRNAME=.\ set DIRNAME=.\
) )
java %KC_OPTS% -cp "%DIRNAME%\client\keycloak-client-registration-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %*
if "x%JAVA%" == "x" (
if "x%JAVA_HOME%" == "x" (
set JAVA=java
echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
) else (
if not exist "%JAVA_HOME%" (
echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
goto END
) else (
if not exist "%JAVA_HOME%\bin\java.exe" (
echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
goto END
)
set "JAVA=%JAVA_HOME%\bin\java"
)
)
)
"%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-client-registration-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %*
:END

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

@ -119,20 +119,22 @@ if "%DEBUG_MODE%" == "true" (
rem Setup Keycloak specific properties rem Setup Keycloak specific properties
set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS% set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%
if "x%JAVA_HOME%" == "x" ( if "x%JAVA%" == "x" (
set JAVA=java if "x%JAVA_HOME%" == "x" (
echo JAVA_HOME is not set. Unexpected results may occur. set JAVA=java
echo Set JAVA_HOME to the directory of your local JDK to avoid this message. echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
) else ( echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
if not exist "%JAVA_HOME%" ( ) else (
echo JAVA_HOME "%JAVA_HOME%" path doesn't exist if not exist "%JAVA_HOME%" (
goto END echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
) else ( goto END
if not exist "%JAVA_HOME%\bin\java.exe" ( ) else (
echo "%JAVA_HOME%\bin\java.exe" does not exist if not exist "%JAVA_HOME%\bin\java.exe" (
goto END echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
) goto END
set "JAVA=%JAVA_HOME%\bin\java" )
set "JAVA=%JAVA_HOME%\bin\java"
)
) )
) )