Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix missing flecs-update-hosts.sh script #785

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Fix missing flecs-update-hosts.sh script #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ function(stage_docker_fs)
COMPONENT docker
EXCLUDE_FROM_ALL
)
install(
FILES ${CMAKE_SOURCE_DIR}/flecs/scripts/flecs-update-hosts.sh
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/fs/usr/local/bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
PERMISSIONS GROUP_READ GROUP_EXECUTE
PERMISSIONS WORLD_READ WORLD_EXECUTE
COMPONENT docker
EXCLUDE_FROM_ALL
)
install_external(cpr::cpr ${CMAKE_CURRENT_BINARY_DIR}/fs/usr/local/lib docker)
install_external(CURL::libcurl ${CMAKE_CURRENT_BINARY_DIR}/fs/usr/local/lib docker)
install_external(Libusb::Libusb ${CMAKE_CURRENT_BINARY_DIR}/fs/usr/local/lib docker)
Expand Down
2 changes: 1 addition & 1 deletion flecs/modules/instances/src/impl/instances_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ auto instances_t::do_module_init() //
auto hosts_thread = std::thread([] {
pthread_setname_np(pthread_self(), "flecs-update-hosts");
auto hosts_process = process_t{};
hosts_process.spawnp("sh", "-c", "/opt/flecs/bin/flecs-update-hosts.sh");
hosts_process.spawnp("sh", "-c", "/usr/local/bin/flecs-update-hosts.sh");
hosts_process.wait(false, false);
});
hosts_thread.detach();
Expand Down