From 72ee8d63b0ba9692b57e91cb80aea2c899ef53d3 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 21 Apr 2025 15:53:59 -0400 Subject: [PATCH 1/5] Revert "DREAMLUAU MACHINE BROKE" This reverts commit 8f05b09936c521f3fc334a27e25480cb0da312a3. --- .../game-servers/modules/tgs/EventScripts/tg/PreCompile.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh b/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh index 353bcba..852da4e 100755 --- a/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh +++ b/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh @@ -47,11 +47,7 @@ echo "dreamluau: checkout" git checkout "$DREAMLUAU_VERSION" >/dev/null echo "dreamluau: building" env LIBCLANG_PATH="$(find /nix/store -name *-clang-*-lib)/lib" cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu -cp target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so" - -# EMERGENCY FIX, SOMETHING IS WRONG WITH THE ABOVE -cp "${TGS_INSTANCE_ROOT}/Configuration/EventScripts.old/libdreamluau.so" "$1/libdreamluau.so" - +mv target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so" cd "$work_directory" echo "dreamluau: deployment finish" From e239e82489aaab5e634b7e3124c28b0fb571a172 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 21 Apr 2025 15:54:58 -0400 Subject: [PATCH 2/5] Use a `cp` for sanity here --- systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh b/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh index 852da4e..e8ccda2 100755 --- a/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh +++ b/systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh @@ -47,7 +47,7 @@ echo "dreamluau: checkout" git checkout "$DREAMLUAU_VERSION" >/dev/null echo "dreamluau: building" env LIBCLANG_PATH="$(find /nix/store -name *-clang-*-lib)/lib" cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu -mv target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so" +cp target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so" cd "$work_directory" echo "dreamluau: deployment finish" From 8a6ce3ae6f840b38110c81ac769a0afd785d64e2 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 22 Apr 2025 19:46:08 -0400 Subject: [PATCH 3/5] Strace what's going on --- .../modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh | 3 +++ systems/game-servers/modules/tgs/default.nix | 5 +++++ 2 files changed, 8 insertions(+) create mode 100755 systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh diff --git a/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh b/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh new file mode 100755 index 0000000..360d021 --- /dev/null +++ b/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +timeout 60 strace -p $1 diff --git a/systems/game-servers/modules/tgs/default.nix b/systems/game-servers/modules/tgs/default.nix index 055e930..e61ad99 100644 --- a/systems/game-servers/modules/tgs/default.nix +++ b/systems/game-servers/modules/tgs/default.nix @@ -13,6 +13,11 @@ # `/Configuration/EventScripts` is symlinked to these directories environment.etc = { #TG + "tgs-EventScripts.d/tg/DreamDaemonLaunch.sh" = { + text = (builtins.readFile ./EventScripts/tg/DreamDaemonLaunch.sh); + group = "tgstation-server"; + mode = "0755"; + }; "tgs-EventScripts.d/tg/DreamDaemonPreLaunch.sh" = { text = (builtins.readFile ./EventScripts/tg/DreamDaemonPreLaunch.sh); group = "tgstation-server"; From 892a0972c121c089a16835fce25111668a1a15ea Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 22 Apr 2025 20:14:24 -0400 Subject: [PATCH 4/5] GIVE STRACE --- systems/game-servers/modules/tgs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/game-servers/modules/tgs/default.nix b/systems/game-servers/modules/tgs/default.nix index e61ad99..11732f2 100644 --- a/systems/game-servers/modules/tgs/default.nix +++ b/systems/game-servers/modules/tgs/default.nix @@ -141,6 +141,7 @@ rclone yt-dlp # For Internet Sounds lua # Lua Support + strace ] ); }; From 45e19b732eec7400e3db33382951afd5f6439265 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 22 Apr 2025 20:40:34 -0400 Subject: [PATCH 5/5] Try this --- .../modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh b/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh index 360d021..ad6b445 100755 --- a/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh +++ b/systems/game-servers/modules/tgs/EventScripts/tg/DreamDaemonLaunch.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/usr/bin/env bash timeout 60 strace -p $1