Date: Wednesday, February 23, 2022 @ 22:14:18 Author: artafinde Revision: 1136327
archrelease: copy trunk to community-testing-any Added: keycloak/repos/community-testing-any/PKGBUILD (from rev 1136326, keycloak/trunk/PKGBUILD) keycloak/repos/community-testing-any/common.sh (from rev 1136326, keycloak/trunk/common.sh) keycloak/repos/community-testing-any/keycloak.install (from rev 1136326, keycloak/trunk/keycloak.install) keycloak/repos/community-testing-any/keycloak.service (from rev 1136326, keycloak/trunk/keycloak.service) keycloak/repos/community-testing-any/keycloak.sysusers (from rev 1136326, keycloak/trunk/keycloak.sysusers) keycloak/repos/community-testing-any/keycloak.tmpfiles (from rev 1136326, keycloak/trunk/keycloak.tmpfiles) keycloak/repos/community-testing-any/pin-java-version.patch (from rev 1136326, keycloak/trunk/pin-java-version.patch) Deleted: keycloak/repos/community-testing-any/PKGBUILD keycloak/repos/community-testing-any/common.sh keycloak/repos/community-testing-any/keycloak.install keycloak/repos/community-testing-any/keycloak.service keycloak/repos/community-testing-any/keycloak.sysusers keycloak/repos/community-testing-any/keycloak.tmpfiles keycloak/repos/community-testing-any/pin-java-version.patch ------------------------+ PKGBUILD | 182 +++++++++++++++++++++++++---------------------- common.sh | 6 - keycloak.install | 14 +-- keycloak.service | 102 +++++++++++++------------- keycloak.sysusers | 2 keycloak.tmpfiles | 6 - pin-java-version.patch | 112 ++++++++++++++-------------- 7 files changed, 218 insertions(+), 206 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-02-23 22:13:13 UTC (rev 1136326) +++ PKGBUILD 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,85 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <svenst...@archlinux.org> -# Contributor: Nikita Volodin <volodin.n at gmail dot com> - -pkgname=keycloak -pkgver=17.0.0 -_java=11 -pkgrel=2 -pkgdesc="Open Source Identity and Access Management For Modern Applications and Services" -arch=('any') -url="https://www.keycloak.org/" -license=('Apache') -depends=("java-runtime=${_java}" 'grep' 'bash' 'coreutils' 'util-linux') -makedepends=('maven' 'git' "java-environment=${_java}") -backup=( - 'etc/keycloak/keycloak.conf' -) -install=keycloak.install -options=(emptydirs) -source=(https://github.com/keycloak/keycloak/archive/$pkgver/$pkgname-$pkgver.tar.gz - keycloak.service - keycloak.sysusers - keycloak.tmpfiles - common.sh - pin-java-version.patch) -sha512sums=('5d6cde979db234dc58d591958fbf4acdb45d461666e4fa9d9616551ce792c18c750f4d5336853052408c0e88ca445944937f1f167ec9ce1eb50732981e84b770' - '1512520528b6893997b8a3c4899fbb84a897f604f279f64fc1228785a27544499f1c8951f8997129fb2b857d2d3c11b09fb9493f83faa20a0594c759adbe0823' - '2e2ba147007ad74e38579a8838d79de47beac509b4bd1a14d7f80905953d79a7396d781f141b461ec688f5ceef9a1081a825a4ca8afc1ea12c178d8ae7f5a7dd' - '362be58e0f18094a6849aaec56ee51aeb72bf62805c87709aa1f435770891138a6cfe2a7de9a1f106212bda0b905f225fcace299a8b811cc6d977783449538e6' - '4ae3f9fc42bfee602480c1c8cc2d65b44305622b426b74070758fe1c92a06ff12901ffebacbfe2ba34cbf783a8787f6073f74db3674c96e7a6109ed5b45d3a07' - 'c0351896427c7b7b73f446481a30dc735365a91541e7039cd613d1c7357c55c9559e388bc260e004c2a52211df1d23d9e24cc9c8ca956398f6e508ef96cb0ee2') - -prepare() { - cd $pkgname-$pkgver - - patch -Np1 -i "$srcdir"/pin-java-version.patch -} - -build() { - cd $pkgname-$pkgver - - export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:$PATH" - mvn -am \ - -s maven-settings.xml \ - -DskipTestsuite \ - -DskipExamples \ - -DskipTests \ - -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" \ - clean package -} - -package() { - cd $pkgname-$pkgver - - install -vdm 755 "${pkgdir}"/{usr/share/java,var/log}/"${pkgname}" - install -vdm 755 "${pkgdir}"/var/lib/"${pkgname}"/{deployments,data} - install -vdm 755 "${pkgdir}"/usr/bin - - tar xf quarkus/dist/target/${pkgname}-${pkgver}.tar.gz --strip 1 \ - -C "${pkgdir}/usr/share/java/${pkgname}" - install -vDm 755 "${srcdir}/common.sh" "${pkgdir}/usr/share/java/${pkgname}/bin/common.sh" - # Clean up unwanted files - rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/LICENSE.txt - rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/bin/*.bat - # Fix permissions from untar - chown -R root:root "${pkgdir}/usr/share/java/${pkgname}" - - install -vdm 755 "${pkgdir}/etc" - mv -v "${pkgdir}/usr/share/java/${pkgname}/conf" "${pkgdir}/etc/${pkgname}" - - ln -svf /var/log/keycloak "${pkgdir}/usr/share/java/${pkgname}/log" - ln -svf /var/lib/keycloak/deployments "${pkgdir}/usr/share/java/${pkgname}/deployments" - ln -svf /var/lib/keycloak/data "${pkgdir}/usr/share/java/${pkgname}/data" - - install -vDm 644 "${srcdir}"/keycloak.service "${pkgdir}"/usr/lib/systemd/system/keycloak.service - install -vDm 644 "${srcdir}"/keycloak.sysusers "${pkgdir}"/usr/lib/sysusers.d/keycloak.conf - install -vDm 644 "${srcdir}"/keycloak.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/keycloak.conf - - ln -svf /usr/share/java/keycloak/bin/kc.sh "${pkgdir}"/usr/bin/kc.sh - ln -svf /usr/share/java/keycloak/bin/kcadm.sh "${pkgdir}"/usr/bin/kcadm.sh - ln -svf /usr/share/java/keycloak/bin/kcreg.sh "${pkgdir}"/usr/bin/kcreg.sh - - install -Dm 644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} - -# vim: ts=2 sw=2 et: Copied: keycloak/repos/community-testing-any/PKGBUILD (from rev 1136326, keycloak/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,97 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@archlinux.org> +# Contributor: Nikita Volodin <volodin.n at gmail dot com> + +pkgname=keycloak +pkgver=17.0.0 +_java=11 +pkgrel=3 +pkgdesc="Open Source Identity and Access Management For Modern Applications and Services" +arch=('any') +url="https://www.keycloak.org/" +license=('Apache') +depends=("java-runtime=${_java}" 'grep' 'bash' 'coreutils' 'util-linux') +makedepends=('maven' "java-environment=${_java}") +backup=( + 'etc/keycloak/keycloak.conf' +) +install=keycloak.install +options=(emptydirs) +source=(https://github.com/keycloak/keycloak/archive/$pkgver/$pkgname-$pkgver.tar.gz + keycloak.service + keycloak.sysusers + keycloak.tmpfiles + common.sh + pin-java-version.patch) +sha512sums=('5d6cde979db234dc58d591958fbf4acdb45d461666e4fa9d9616551ce792c18c750f4d5336853052408c0e88ca445944937f1f167ec9ce1eb50732981e84b770' + '1512520528b6893997b8a3c4899fbb84a897f604f279f64fc1228785a27544499f1c8951f8997129fb2b857d2d3c11b09fb9493f83faa20a0594c759adbe0823' + '2e2ba147007ad74e38579a8838d79de47beac509b4bd1a14d7f80905953d79a7396d781f141b461ec688f5ceef9a1081a825a4ca8afc1ea12c178d8ae7f5a7dd' + '155db40105c08d0aaa810ca5533dc16fc9f82060280541ede6fafd754d30b4844f6d10ace1417a5ad68d89fc54e1b9e6d906ce7ccf973f4ac964422211ed9a72' + '4ae3f9fc42bfee602480c1c8cc2d65b44305622b426b74070758fe1c92a06ff12901ffebacbfe2ba34cbf783a8787f6073f74db3674c96e7a6109ed5b45d3a07' + 'c0351896427c7b7b73f446481a30dc735365a91541e7039cd613d1c7357c55c9559e388bc260e004c2a52211df1d23d9e24cc9c8ca956398f6e508ef96cb0ee2') + +prepare() { + cd $pkgname-$pkgver + + patch -Np1 -i "$srcdir"/pin-java-version.patch +} + +build() { + cd $pkgname-$pkgver + + export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:$PATH" + mvn -am \ + -s maven-settings.xml \ + -DskipTestsuite \ + -DskipExamples \ + -DskipTests \ + -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" \ + clean package +} + +# check() { +# TODO enable once +# cd $pkgname-$pkgver/quarkus + +# export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:$PATH" +# mvn -am \ +# -s ../maven-settings.xml \ +# -DskipExamples \ +# -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" \ +# test +# } + +package() { + cd $pkgname-$pkgver + + install -vdm 755 "${pkgdir}"/{usr/share/java,var/log}/"${pkgname}" + install -vdm 755 "${pkgdir}"/var/lib/"${pkgname}"/{deployments,data} + install -vdm 755 "${pkgdir}"/usr/bin + + tar xf quarkus/dist/target/${pkgname}-${pkgver}.tar.gz --strip 1 \ + -C "${pkgdir}/usr/share/java/${pkgname}" + install -vDm 755 "${srcdir}/common.sh" "${pkgdir}/usr/share/java/${pkgname}/bin/common.sh" + # Clean up unwanted files + rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/LICENSE.txt + rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/bin/*.bat + # Fix permissions from untar + chown -R root:root "${pkgdir}/usr/share/java/${pkgname}" + + install -vdm 755 "${pkgdir}/etc" + mv -v "${pkgdir}/usr/share/java/${pkgname}/conf" "${pkgdir}/etc/${pkgname}" + + ln -svf /var/log/keycloak "${pkgdir}/usr/share/java/${pkgname}/log" + ln -svf /var/lib/keycloak/deployments "${pkgdir}/usr/share/java/${pkgname}/deployments" + ln -svf /var/lib/keycloak/data "${pkgdir}/usr/share/java/${pkgname}/data" + + install -vDm 644 "${srcdir}"/keycloak.service "${pkgdir}"/usr/lib/systemd/system/keycloak.service + install -vDm 644 "${srcdir}"/keycloak.sysusers "${pkgdir}"/usr/lib/sysusers.d/keycloak.conf + install -vDm 644 "${srcdir}"/keycloak.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/keycloak.conf + + ln -svf /usr/share/java/keycloak/bin/kc.sh "${pkgdir}"/usr/bin/kc.sh + ln -svf /usr/share/java/keycloak/bin/kcadm.sh "${pkgdir}"/usr/bin/kcadm.sh + ln -svf /usr/share/java/keycloak/bin/kcreg.sh "${pkgdir}"/usr/bin/kcreg.sh + + install -Dm 644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" +} + +# vim: ts=2 sw=2 et: Deleted: common.sh =================================================================== --- common.sh 2022-02-23 22:13:13 UTC (rev 1136326) +++ common.sh 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,3 +0,0 @@ -# Pin java version -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk -export JAVA="$JAVA_HOME/bin/java" Copied: keycloak/repos/community-testing-any/common.sh (from rev 1136326, keycloak/trunk/common.sh) =================================================================== --- common.sh (rev 0) +++ common.sh 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,3 @@ +# Pin java version +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk +export JAVA="$JAVA_HOME/bin/java" Deleted: keycloak.install =================================================================== --- keycloak.install 2022-02-23 22:13:13 UTC (rev 1136326) +++ keycloak.install 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,7 +0,0 @@ -post_upgrade() { - if [ "$1" = "17.0.0-2" ]; then - usermod -d /var/lib/keycloak keycloak - fi -} - -# vim: ts=2 sw=2 et: \ No newline at end of file Copied: keycloak/repos/community-testing-any/keycloak.install (from rev 1136326, keycloak/trunk/keycloak.install) =================================================================== --- keycloak.install (rev 0) +++ keycloak.install 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,7 @@ +post_upgrade() { + if [ "$1" = "17.0.0-2" ]; then + usermod -d /var/lib/keycloak keycloak + fi +} + +# vim: ts=2 sw=2 et: \ No newline at end of file Deleted: keycloak.service =================================================================== --- keycloak.service 2022-02-23 22:13:13 UTC (rev 1136326) +++ keycloak.service 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,51 +0,0 @@ -[Unit] -Description=Keycloak server -After=network-online.target -Wants=network-online.target systemd-networkd-wait-online.service - -[Service] -User=keycloak -Group=keycloak - -# Running the ExecStartPre as root is not ideal, but at the moment -# the only solution for Quarkus modifying the serialized -# data under <keycloak-home>/lib/quarkus -# Raised upstream as https://github.com/keycloak/keycloak/discussions/10323 -ExecStartPre=!/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf build - -ExecStart=/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf start -ReadWritePaths=/var/lib/keycloak -ReadWritePaths=/var/log/keycloak -ReadWritePaths=/usr/share/java/keycloak/lib/quarkus -ReadOnlyPaths=/etc/keycloak - -# Disable timeout logic and wait until process is stopped -TimeoutStopSec=0 - -# SIGTERM signal is used to stop the Java process -KillSignal=SIGTERM - -# Send the signal only to the JVM rather than its control group -KillMode=process - -# Java process is never killed -SendSIGKILL=no - -# When a JVM receives a SIGTERM signal it exits with code 143 -SuccessExitStatus=143 - -# Hardening options -CapabilityBoundingSet= -AmbientCapabilities= -NoNewPrivileges=true -ProtectHome=true -ProtectSystem=strict -ProtectKernelTunables=true -ProtectKernelModules=true -ProtectControlGroups=true -PrivateTmp=true -PrivateDevices=true -LockPersonality=true - -[Install] -WantedBy=multi-user.target Copied: keycloak/repos/community-testing-any/keycloak.service (from rev 1136326, keycloak/trunk/keycloak.service) =================================================================== --- keycloak.service (rev 0) +++ keycloak.service 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,51 @@ +[Unit] +Description=Keycloak server +After=network-online.target +Wants=network-online.target systemd-networkd-wait-online.service + +[Service] +User=keycloak +Group=keycloak + +# Running the ExecStartPre as root is not ideal, but at the moment +# the only solution for Quarkus modifying the serialized +# data under <keycloak-home>/lib/quarkus +# Raised upstream as https://github.com/keycloak/keycloak/discussions/10323 +ExecStartPre=!/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf build + +ExecStart=/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf start +ReadWritePaths=/var/lib/keycloak +ReadWritePaths=/var/log/keycloak +ReadWritePaths=/usr/share/java/keycloak/lib/quarkus +ReadOnlyPaths=/etc/keycloak + +# Disable timeout logic and wait until process is stopped +TimeoutStopSec=0 + +# SIGTERM signal is used to stop the Java process +KillSignal=SIGTERM + +# Send the signal only to the JVM rather than its control group +KillMode=process + +# Java process is never killed +SendSIGKILL=no + +# When a JVM receives a SIGTERM signal it exits with code 143 +SuccessExitStatus=143 + +# Hardening options +CapabilityBoundingSet= +AmbientCapabilities= +NoNewPrivileges=true +ProtectHome=true +ProtectSystem=strict +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectControlGroups=true +PrivateTmp=true +PrivateDevices=true +LockPersonality=true + +[Install] +WantedBy=multi-user.target Deleted: keycloak.sysusers =================================================================== --- keycloak.sysusers 2022-02-23 22:13:13 UTC (rev 1136326) +++ keycloak.sysusers 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1 +0,0 @@ -u keycloak - "keycloak user" /var/lib/keycloak - Copied: keycloak/repos/community-testing-any/keycloak.sysusers (from rev 1136326, keycloak/trunk/keycloak.sysusers) =================================================================== --- keycloak.sysusers (rev 0) +++ keycloak.sysusers 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1 @@ +u keycloak - "keycloak user" /var/lib/keycloak - Deleted: keycloak.tmpfiles =================================================================== --- keycloak.tmpfiles 2022-02-23 22:13:13 UTC (rev 1136326) +++ keycloak.tmpfiles 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,3 +0,0 @@ -z /usr/log/keycloak - keycloak keycloak - -z /var/lib/keycloak/data - keycloak keycloak - -Z /var/lib/keycloak/deployments - keycloak keycloak - \ No newline at end of file Copied: keycloak/repos/community-testing-any/keycloak.tmpfiles (from rev 1136326, keycloak/trunk/keycloak.tmpfiles) =================================================================== --- keycloak.tmpfiles (rev 0) +++ keycloak.tmpfiles 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,3 @@ +z /var/log/keycloak - keycloak keycloak - +z /var/lib/keycloak/data - keycloak keycloak - +Z /var/lib/keycloak/deployments - keycloak keycloak - \ No newline at end of file Deleted: pin-java-version.patch =================================================================== --- pin-java-version.patch 2022-02-23 22:13:13 UTC (rev 1136326) +++ pin-java-version.patch 2022-02-23 22:14:18 UTC (rev 1136327) @@ -1,56 +0,0 @@ -diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh -index a7bfc6a48a..770e28c332 100755 ---- a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh -+++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh -@@ -20,7 +20,7 @@ if [ "x$RESOLVED_NAME" = "x" ]; then - fi - - DIRNAME=`dirname "$RESOLVED_NAME"` -+. "$DIRNAME/common.sh" - -- --java $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@" -+$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@" - -diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh -index 83bd4b70e4..9cac612b5f 100755 ---- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh -+++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh -@@ -20,4 +20,6 @@ if [ "x$RESOLVED_NAME" = "x" ]; then - fi - - DIRNAME=`dirname "$RESOLVED_NAME"` --java $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@" -\ No newline at end of file -+. "$DIRNAME/common.sh" -+ -+$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@" -\ No newline at end of file -diff --git a/quarkus/dist/src/main/content/bin/kc.sh b/quarkus/dist/src/main/content/bin/kc.sh -index 3097ea7a0a..90f134538a 100644 ---- a/quarkus/dist/src/main/content/bin/kc.sh -+++ b/quarkus/dist/src/main/content/bin/kc.sh -@@ -22,6 +22,7 @@ fi - - GREP="grep" - DIRNAME=`dirname "$RESOLVED_NAME"` -+. "$DIRNAME/common.sh" - - SERVER_OPTS="-Dkc.home.dir=$DIRNAME/../ -Djboss.server.config.dir=$DIRNAME/../conf -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dquarkus-log-max-startup-records=10000" - -@@ -88,11 +89,11 @@ CLASSPATH_OPTS="$DIRNAME/../lib/quarkus-run.jar" - JAVA_RUN_OPTS="$JAVA_OPTS $SERVER_OPTS -cp $CLASSPATH_OPTS io.quarkus.bootstrap.runner.QuarkusEntryPoint ${CONFIG_ARGS#?}" - - if [[ $CONFIG_ARGS = *"--auto-build"* ]]; then -- eval java -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS -+ eval $JAVA -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS - EXIT_CODE=$? - if [ $EXIT_CODE != 0 ]; then - exit $EXIT_CODE - fi - fi - --eval exec java ${JAVA_RUN_OPTS} -\ No newline at end of file -+eval exec $JAVA ${JAVA_RUN_OPTS} -\ No newline at end of file Copied: keycloak/repos/community-testing-any/pin-java-version.patch (from rev 1136326, keycloak/trunk/pin-java-version.patch) =================================================================== --- pin-java-version.patch (rev 0) +++ pin-java-version.patch 2022-02-23 22:14:18 UTC (rev 1136327) @@ -0,0 +1,56 @@ +diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh +index a7bfc6a48a..770e28c332 100755 +--- a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh ++++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh +@@ -20,7 +20,7 @@ if [ "x$RESOLVED_NAME" = "x" ]; then + fi + + DIRNAME=`dirname "$RESOLVED_NAME"` ++. "$DIRNAME/common.sh" + +- +-java $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@" ++$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@" + +diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh +index 83bd4b70e4..9cac612b5f 100755 +--- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh ++++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh +@@ -20,4 +20,6 @@ if [ "x$RESOLVED_NAME" = "x" ]; then + fi + + DIRNAME=`dirname "$RESOLVED_NAME"` +-java $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@" +\ No newline at end of file ++. "$DIRNAME/common.sh" ++ ++$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@" +\ No newline at end of file +diff --git a/quarkus/dist/src/main/content/bin/kc.sh b/quarkus/dist/src/main/content/bin/kc.sh +index 3097ea7a0a..90f134538a 100644 +--- a/quarkus/dist/src/main/content/bin/kc.sh ++++ b/quarkus/dist/src/main/content/bin/kc.sh +@@ -22,6 +22,7 @@ fi + + GREP="grep" + DIRNAME=`dirname "$RESOLVED_NAME"` ++. "$DIRNAME/common.sh" + + SERVER_OPTS="-Dkc.home.dir=$DIRNAME/../ -Djboss.server.config.dir=$DIRNAME/../conf -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dquarkus-log-max-startup-records=10000" + +@@ -88,11 +89,11 @@ CLASSPATH_OPTS="$DIRNAME/../lib/quarkus-run.jar" + JAVA_RUN_OPTS="$JAVA_OPTS $SERVER_OPTS -cp $CLASSPATH_OPTS io.quarkus.bootstrap.runner.QuarkusEntryPoint ${CONFIG_ARGS#?}" + + if [[ $CONFIG_ARGS = *"--auto-build"* ]]; then +- eval java -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS ++ eval $JAVA -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS + EXIT_CODE=$? + if [ $EXIT_CODE != 0 ]; then + exit $EXIT_CODE + fi + fi + +-eval exec java ${JAVA_RUN_OPTS} +\ No newline at end of file ++eval exec $JAVA ${JAVA_RUN_OPTS} +\ No newline at end of file