diff --git a/generate-scrolls_test.go b/generate-scrolls_test.go index dd37b5db..ecfb9463 100644 --- a/generate-scrolls_test.go +++ b/generate-scrolls_test.go @@ -80,6 +80,21 @@ func TestGeneratedSharedPortsRemainConcrete(t *testing.T) { } } +func TestGeneratedLGSMDownloadCommandsAreLineBuffered(t *testing.T) { + scroll := readGeneratedScroll(t, "scrolls/lgsm/arkserver/scroll.yaml") + + update := scroll.Commands["start"].Procedures[0].Command + if !slices.Equal(update, []string{"stdbuf", "-oL", "./arkserver", "update"}) { + t.Fatalf("ARK update command = %#v", update) + } + + installProcedures := scroll.Commands["install"].Procedures + autoInstall := installProcedures[len(installProcedures)-1].Command + if !slices.Equal(autoInstall, []string{"stdbuf", "-oL", "./arkserver", "auto-install"}) { + t.Fatalf("ARK auto-install command = %#v", autoInstall) + } +} + type generatedScroll struct { Ports []generatedPort `yaml:"ports"` Commands map[string]generatedCommand `yaml:"commands"` diff --git a/scrolls/lgsm/.build/scroll.yaml.tmpl b/scrolls/lgsm/.build/scroll.yaml.tmpl index 0bb38ff4..37f472cb 100644 --- a/scrolls/lgsm/.build/scroll.yaml.tmpl +++ b/scrolls/lgsm/.build/scroll.yaml.tmpl @@ -147,6 +147,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./{{ .Version }} - update {{- if .Vars.runtime_config_script }} @@ -250,6 +252,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./{{ .Version }} - auto-install {{- if eq .Vars.postinstall "enabled" }} diff --git a/scrolls/lgsm/arkserver/scroll.yaml b/scrolls/lgsm/arkserver/scroll.yaml index 6a4d1981..ec4d2b8c 100644 --- a/scrolls/lgsm/arkserver/scroll.yaml +++ b/scrolls/lgsm/arkserver/scroll.yaml @@ -112,6 +112,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./arkserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -205,6 +207,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./arkserver - auto-install serve: console diff --git a/scrolls/lgsm/cs2server/scroll.yaml b/scrolls/lgsm/cs2server/scroll.yaml index 77ef0b8f..73c46377 100644 --- a/scrolls/lgsm/cs2server/scroll.yaml +++ b/scrolls/lgsm/cs2server/scroll.yaml @@ -116,6 +116,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./cs2server - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -187,6 +189,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./cs2server - auto-install - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd diff --git a/scrolls/lgsm/csgoserver/scroll.yaml b/scrolls/lgsm/csgoserver/scroll.yaml index 7ef377a3..b1dce968 100644 --- a/scrolls/lgsm/csgoserver/scroll.yaml +++ b/scrolls/lgsm/csgoserver/scroll.yaml @@ -68,6 +68,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./csgoserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -139,6 +141,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./csgoserver - auto-install serve: console diff --git a/scrolls/lgsm/dayzserver/scroll.yaml b/scrolls/lgsm/dayzserver/scroll.yaml index 8df95d94..e0d8981e 100644 --- a/scrolls/lgsm/dayzserver/scroll.yaml +++ b/scrolls/lgsm/dayzserver/scroll.yaml @@ -57,6 +57,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./dayzserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -128,6 +130,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./dayzserver - auto-install serve: console diff --git a/scrolls/lgsm/gmodserver/scroll.yaml b/scrolls/lgsm/gmodserver/scroll.yaml index 89d75f38..dd4f46c3 100644 --- a/scrolls/lgsm/gmodserver/scroll.yaml +++ b/scrolls/lgsm/gmodserver/scroll.yaml @@ -70,6 +70,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./gmodserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -141,6 +143,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./gmodserver - auto-install serve: console diff --git a/scrolls/lgsm/pwserver/scroll.yaml b/scrolls/lgsm/pwserver/scroll.yaml index 1cd51069..2e3740d6 100644 --- a/scrolls/lgsm/pwserver/scroll.yaml +++ b/scrolls/lgsm/pwserver/scroll.yaml @@ -54,6 +54,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./pwserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -125,6 +127,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./pwserver - auto-install serve: console diff --git a/scrolls/lgsm/pzserver/scroll.yaml b/scrolls/lgsm/pzserver/scroll.yaml index bf660a84..5c9d1f9c 100644 --- a/scrolls/lgsm/pzserver/scroll.yaml +++ b/scrolls/lgsm/pzserver/scroll.yaml @@ -97,6 +97,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./pzserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -169,6 +171,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./pzserver - auto-install serve: console diff --git a/scrolls/lgsm/sdtdserver/scroll.yaml b/scrolls/lgsm/sdtdserver/scroll.yaml index 48fd43c2..307ffc4b 100644 --- a/scrolls/lgsm/sdtdserver/scroll.yaml +++ b/scrolls/lgsm/sdtdserver/scroll.yaml @@ -68,6 +68,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./sdtdserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -139,6 +141,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./sdtdserver - auto-install serve: console diff --git a/scrolls/lgsm/untserver/scroll.yaml b/scrolls/lgsm/untserver/scroll.yaml index 4bc08ff9..3349d41c 100644 --- a/scrolls/lgsm/untserver/scroll.yaml +++ b/scrolls/lgsm/untserver/scroll.yaml @@ -60,6 +60,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./untserver - update - image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd @@ -131,6 +133,8 @@ commands: - path: "/server" working_dir: "/server" command: + - stdbuf + - -oL - ./untserver - auto-install serve: console