From d0dd8b347ec5fb2623ae25945437e3a323b8f15c Mon Sep 17 00:00:00 2001 From: SlavaVlad Date: Thu, 11 Jun 2026 13:58:02 +0300 Subject: [PATCH 1/5] CI via tailscale update --- prep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prep b/prep index 6bfcea1..011591f 100755 --- a/prep +++ b/prep @@ -28,7 +28,7 @@ def main(): print() print("╔═══════════════════════════════════════╗") - print("║ Prep: mods → rsync → config → commit║") + print("║ Prep: mods → rsync → config → commit ║") print("╚═══════════════════════════════════════╝") print() From 3c21777ba44f0e0e7699ffe16797bd3f836a543e Mon Sep 17 00:00:00 2001 From: SlavaVlad Date: Thu, 11 Jun 2026 14:00:23 +0300 Subject: [PATCH 2/5] Update LocalMods --- config_player.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config_player.xml b/config_player.xml index 068d88e..047c9c4 100644 --- a/config_player.xml +++ b/config_player.xml @@ -7,6 +7,8 @@ + + @@ -32,7 +34,6 @@ - From cb402decb52681a16084ab9ac37bc3749fe9eacf Mon Sep 17 00:00:00 2001 From: SlavaVlad Date: Thu, 11 Jun 2026 14:14:34 +0300 Subject: [PATCH 3/5] Update LocalMods --- config_player.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config_player.xml b/config_player.xml index 047c9c4..50d401a 100644 --- a/config_player.xml +++ b/config_player.xml @@ -3,11 +3,10 @@ + - - @@ -40,7 +39,6 @@ - From 01eaf8fb050bec43995484106277bebde7c77cf1 Mon Sep 17 00:00:00 2001 From: SlavaVlad Date: Sun, 14 Jun 2026 15:24:36 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=85=D0=BE=D1=81=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_player.xml | 2 +- prep | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/config_player.xml b/config_player.xml index 50d401a..bbf7fc2 100644 --- a/config_player.xml +++ b/config_player.xml @@ -44,9 +44,9 @@ - + \ No newline at end of file diff --git a/prep b/prep index 011591f..94f8c91 100755 --- a/prep +++ b/prep @@ -10,7 +10,7 @@ PREPARE_LOCAL = os.path.join(BASE, "prepare_local") AUTOGEN = os.path.join(BASE, "scripts", "autogen_config.py") LOCALMODS_DIR = os.path.join(BASE, "LocalMods") -RSYNC_DEST = "root@homelabvm:/opt/barotrauma/LocalMods/" +RSYNC_DEST = "root@barotrauma:/opt/barotrauma/LocalMods/" def log_ok(msg): @@ -51,13 +51,7 @@ def main(): log_ok("config_player.xml generated") print() - log_info("Step 4/4: Committing...") - subprocess.run(["git", "add", "-A"], cwd=BASE, check=True) - subprocess.run(["git", "commit", "-m", msg], cwd=BASE, check=True) - log_ok(f"Committed: {msg}") - print() - - log_ok("Done. Push manually when ready.") + log_ok("Done.") if __name__ == "__main__": From f13a922a3e4d5a8a0436085c890fbb72024e13bd Mon Sep 17 00:00:00 2001 From: SlavaVlad Date: Tue, 16 Jun 2026 15:04:06 +0300 Subject: [PATCH 5/5] Prep: also rsync config_player.xml to server --- prep | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/prep b/prep index 94f8c91..7c9e4d9 100755 --- a/prep +++ b/prep @@ -11,6 +11,8 @@ AUTOGEN = os.path.join(BASE, "scripts", "autogen_config.py") LOCALMODS_DIR = os.path.join(BASE, "LocalMods") RSYNC_DEST = "root@barotrauma:/opt/barotrauma/LocalMods/" +CONFIG_PATH = os.path.join(BASE, "config_player.xml") +RSYNC_SSH = "ssh -p 22" def log_ok(msg): @@ -27,31 +29,46 @@ def main(): msg = " ".join(sys.argv[1:]) if len(sys.argv) > 1 else "Update LocalMods" print() - print("╔═══════════════════════════════════════╗") - print("║ Prep: mods → rsync → config → commit ║") - print("╚═══════════════════════════════════════╝") + print("╔══════════════════════════════════════════╗") + print("║ Prep: mods → config → rsync → commit ║") + print("╚══════════════════════════════════════════╝") print() - log_info("Step 1/4: Copy mods from workshop...") + log_info("Step 1/5: Copy mods from workshop...") subprocess.run([sys.executable, PREPARE_LOCAL], check=True) log_ok("LocalMods ready") print() - log_info("Step 2/4: Rsyncing LocalMods/ to server...") - subprocess.run([ - "rsync", "-avz", "--delete", - "-e", "ssh -p 22", - LOCALMODS_DIR + "/", RSYNC_DEST - ], check=True) - log_ok("LocalMods synced to homelabvm") - print() - - log_info("Step 3/4: Generating config_player.xml...") + log_info("Step 2/5: Generating config_player.xml...") subprocess.run([sys.executable, AUTOGEN], check=True) log_ok("config_player.xml generated") print() - log_ok("Done.") + log_info("Step 3/5: Rsyncing LocalMods/ to server...") + subprocess.run([ + "rsync", "-avz", "--delete", + "-e", RSYNC_SSH, + LOCALMODS_DIR + "/", RSYNC_DEST + ], check=True) + log_ok("LocalMods synced") + print() + + log_info("Step 4/5: Rsyncing config_player.xml to server...") + subprocess.run([ + "rsync", "-avz", + "-e", RSYNC_SSH, + CONFIG_PATH, "root@barotrauma:/opt/barotrauma/config_player.xml" + ], check=True) + log_ok("config_player.xml synced") + print() + + log_info("Step 5/5: Committing...") + subprocess.run(["git", "add", "-A"], cwd=BASE, check=True) + subprocess.run(["git", "commit", "-m", msg], cwd=BASE, check=True) + log_ok(f"Committed: {msg}") + print() + + log_ok("Done. Push manually when ready.") if __name__ == "__main__":