Fix ARM64 emulation support in all entrypoints #587
Merged
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
- Add shared setup-exec.sh script to handle ARM64 emulation logic - Update scenario.sh and scenario2map.sh to use box64 emulation on ARM64 - Refactor docker-entrypoint.sh and docker-entrypoint-rootless.sh to use shared script - Ensures all factorio binary calls work correctly on ARM64 platforms Fixes #585 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Add shellcheck disable=SC1091 for dynamic source paths - Quote INSTALLED_DIRECTORY variables to prevent word splitting - Resolves all reported shellcheck issues in PR review 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
|
thank you for this fix! just to be sure, this will break the other entrypoints for those without space age dlc |
|
will this be merged? |
The docker-dlc.sh script was only called in docker-entrypoint.sh, not in scenario.sh. This caused DLC_SPACE_AGE=false to not be applied when using the scenario entrypoint, breaking it for users without the Space Age DLC.
Member
Author
|
Sorry this PR got lost! You were right - I've now added the |
|
appreciate it |
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.
Summary
scenario.shandscenario2map.shentrypointssetup-exec.shscript to handle ARM64 emulation logic consistentlyProblem
Issue #585 identified that
scenario.shandscenario2map.shwere not using the ARM64 emulation logic (box64) that was present indocker-entrypoint.sh. This caused these entrypoints to fail on ARM64 platforms.Solution
setup-exec.shthat handles the ARM64 emulation setupscenario.sh- now supports ARM64 emulationscenario2map.sh- now supports ARM64 emulationdocker-entrypoint.sh- refactored to use shared scriptdocker-entrypoint-rootless.sh- refactored to use shared scriptTest plan
Files changed
docker/files/setup-exec.sh- New shared script for ARM64 emulationdocker/files/scenario.sh- Updated to use shared emulation logicdocker/files/scenario2map.sh- Updated to use shared emulation logicdocker/files/docker-entrypoint.sh- Refactored to use shared scriptdocker/files/docker-entrypoint-rootless.sh- Refactored to use shared scriptFixes #585
🤖 Generated with Claude Code