diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-17 22:59:56 +1100 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-17 22:59:56 +1100 |
commit | 87f63129002bbd967112b747981d5425d57f67a8 (patch) | |
tree | 5cceae0d9d5f6dd68a5956d9a4528059068b3fae /scripts/ci | |
parent | b648214e3ca71a0224ce66cd4e8053987fe991c6 (diff) |
fix linux assemble.sh
Diffstat (limited to 'scripts/ci')
-rwxr-xr-x | scripts/ci/linux/assemble.sh | 6 | ||||
-rw-r--r-- | scripts/ci/windows/assemble.bat | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ci/linux/assemble.sh b/scripts/ci/linux/assemble.sh index 5a7cc82..cdd6cb2 100755 --- a/scripts/ci/linux/assemble.sh +++ b/scripts/ci/linux/assemble.sh @@ -12,16 +12,15 @@ touch client_distribution/mods/mods_go_here mkdir client_distribution/linux cp \ dist/starbound \ - dist/starbound_server \ dist/btree_repacker \ dist/asset_packer \ dist/asset_unpacker \ dist/dump_versioned_json \ dist/make_versioned_json \ - dist/*.so \ + lib/linux/libdiscord_game_sdk.so \ + lib/linux/libsteam_api.so \ scripts/ci/linux/sbinit.config \ scripts/ci/linux/run-client.sh \ - scripts/ci/linux/run-server.sh \ client_distribution/linux/ mkdir server_distribution @@ -37,7 +36,6 @@ mkdir server_distribution/linux cp \ dist/starbound_server \ dist/btree_repacker \ - dist/*.so \ scripts/ci/linux/run-server.sh \ scripts/ci/linux/sbinit.config \ server_distribution/linux/ diff --git a/scripts/ci/windows/assemble.bat b/scripts/ci/windows/assemble.bat index 4bda92b..a6a8112 100644 --- a/scripts/ci/windows/assemble.bat +++ b/scripts/ci/windows/assemble.bat @@ -8,16 +8,18 @@ mkdir %client%\mods mkdir %client%\assets mkdir %client%\win -.\dist\asset_packer.exe -c scripts\packing.config assets\opensb %client%\assets\opensb.pak - set server=server_distribution if exist %server% rmdir %server% /S /Q xcopy %client% %server% /E /I +.\dist\asset_packer.exe -c scripts\packing.config assets\opensb %client%\assets\opensb.pak + for /f "delims=" %%f in (scripts\ci\windows\files_client.txt) do ( xcopy "%%f" "%client%\win\" /Y ) +.\dist\asset_packer.exe -c scripts\packing.config -s assets\opensb %server%\assets\opensb.pak + for /f "delims=" %%f in (scripts\ci\windows\files_server.txt) do ( xcopy "%%f" "%server%\win\" /Y ) |