Change order of absolute path and normalize in the theme folder #34153
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes keycloak#34028 Signed-off-by: rmartinc <[email protected]>
jonkoops
approved these changes
Oct 21, 2024
Contributor
jonkoops
left a comment
There was a problem hiding this comment.
Tested this on my Macbook and this indeed fixes the issue as expected.
stianst
approved these changes
Oct 22, 2024
rmartinc
added a commit
to rmartinc/keycloak
that referenced
this pull request
Oct 22, 2024
…loak#34153) Closes keycloak#34028 Signed-off-by: rmartinc <[email protected]> (cherry picked from commit a84a2c2)
mposolda
pushed a commit
that referenced
this pull request
Oct 22, 2024
Closes #34028 Signed-off-by: rmartinc <[email protected]> (cherry picked from commit a84a2c2)
Closed
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #34028
The current order is
normalize().toAbsolutePath()but it seems in macos the home folder of keycloak (the system property) is-Dkc.home.dir=./... This is because in macos thereadlinkhas no-foption that canonicalize the path (check kc.sh script). Therefore doing thenormalize()first, the./..into is transformed into empty string ``, and thenthemesfolder is incorrect (nothing is found). If we do in the reverse order (first absolute path and then normalize) the correct themes folder is found. Added a test that uses relative path to get the file.