4 files changed, 43 insertions, 31 deletions
diff --git a/scripts/ci/linux/assemble.sh b/scripts/ci/linux/assemble.sh
new file mode 100644
index 0000000..5215591
--- /dev/null
+++ b/scripts/ci/linux/assemble.sh
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+
+mkdir client_distribution
+mkdir client_distribution/assets
+
+./dist/asset_packer -c scripts/packing.config assets/opensb client_distribution/assets/opensb.pak
+cp -r assets/user client_distribution/assets/
+
+mkdir client_distribution/mods
+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 \
+  scripts/ci/linux/sbinit.config \
+  scripts/ci/linux/run-client.sh \
+  scripts/ci/linux/run-server.sh \
+  client_distribution/linux/
+
+mkdir server_distribution
+mkdir server_distribution/assets
+
+mkdir server_distribution/mods
+touch server_distribution/mods/mods_go_here
+
+./dist/asset_packer -c scripts/packing.config -s assets/opensb server_distribution/assets/opensb.pak
+
+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/linux/build.sh b/scripts/ci/linux/build.sh
deleted file mode 100644
index b70f6de..0000000
--- a/scripts/ci/linux/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-mkdir -p build
-
-cd build
-rm -f CMakeCache.txt
-
-cmake \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DSTAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX=ON \
-  -DSTAR_USE_JEMALLOC=ON \
-  -DSTAR_ENABLE_STEAM_INTEGRATION=ON \
-  -DCMAKE_INCLUDE_PATH=../lib/linux/include \
-  -DCMAKE_LIBRARY_PATH=../lib/linux \
-  ../source
-
-make -j2
-
-cd ..
-
-mv dist linux_binaries
-cp lib/linux/*.so linux_binaries/
diff --git a/scripts/ci/linux/sbinit.config b/scripts/ci/linux/sbinit.config
index 45918a1..e7715fc 100644
--- a/scripts/ci/linux/sbinit.config
+++ b/scripts/ci/linux/sbinit.config
@@ -1,6 +1,5 @@
 {
   "assetDirectories" : [
-    "./data/",
     "../assets/",
     "../mods/"
   ],
diff --git a/scripts/ci/linux/test.sh b/scripts/ci/linux/test.sh
deleted file mode 100644
index 0bc8e7c..0000000
--- a/scripts/ci/linux/test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-cd linux_binaries
-
-cp ../scripts/linux/sbinit.config .
-
-./core_tests
-./game_tests