Ensure container starts if it is mounted with an empty /modules directory. #30699
+2
−3
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
Half-Shot
changed the title
t3chguy
approved these changes
Sep 4, 2025
|
(Bleh, this is |
t3chguy
reviewed
Sep 4, 2025
Comment on lines
18
to
20
| if [ -d "/modules" ]; then | ||
| cd /modules | ||
|
|
||
| for MODULE in * | ||
| do | ||
| # If the module has a package.json, use its main field as the entrypoint | ||
| ENTRYPOINT="index.js" | ||
| if [ -f "/modules/$MODULE/package.json" ]; then | ||
| ENTRYPOINT=$(jq -r '.main' "/modules/$MODULE/package.json") | ||
| fi | ||
|
|
||
| entrypoint_log "Loading module $MODULE with entrypoint $ENTRYPOINT" | ||
|
|
||
| # Append the module to the config | ||
| jq ".modules += [\"/modules/$MODULE/$ENTRYPOINT\"]" /tmp/element-web-config/config.json | sponge /tmp/element-web-config/config.json | ||
| done | ||
| # ...and the module directory has modules in it | ||
| if [ "$( ls -A '/modules' )" ]; then |
t3chguy
approved these changes
Sep 4, 2025
Half-Shot
added
the
backport staging
Dileep9999
pushed a commit
to hemanth-nag/element-web
that referenced
this pull request
Oct 8, 2025
…tory. (element-hq#30699) * Set nullglob * Replace with a if statement (because we're using sh) * combine if
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Bash is great. So great in fact, that if your glob expression doesn't match any files then the loop will run once with your glob expression as the only item.
This causes Element Web to fail to run when the
/modulesdirectory is present, as it thinks it has found a module under*. This setsnullglobwhich works as you'd expect by skipping the for loop if a glob expression doesn't match.Checklist
public/exportedsymbols have accurate TSDoc documentation.