From f8d597f5130b643e8d19dff3e93f5ceb48df15e1 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Thu, 2 May 2019 12:10:01 -0400 Subject: [PATCH] #41 Add `host` to the environment --- .../SubServers/Bungee/Host/Internal/InternalSubCreator.java | 1 + .../SubServers/Bungee/Host/Internal/InternalSubServer.java | 1 + .../src/net/ME1312/SubServers/Host/Executable/SubCreator.java | 1 + .../src/net/ME1312/SubServers/Host/Executable/SubServer.java | 1 + 4 files changed, 4 insertions(+) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 1b2af53b..ad531084 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -87,6 +87,7 @@ private YAMLSection build(File dir, ServerTemplate template, List Loading Template: " + template.getDisplayName()); Util.copyDirectory(template.getDirectory(), dir); var.put("name", name); + var.put("host", host.getName()); var.put("template", template.getName()); var.put("type", template.getType().toString().toUpperCase()); var.put("version", version.toString()); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java index 17556f2b..819d9f81 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java @@ -121,6 +121,7 @@ private void run() { try { ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.getCreator().getBashDirectory(), executable)).directory(directory); pb.environment().put("name", getName()); + pb.environment().put("host", host.getName()); pb.environment().put("address", host.getAddress().getHostAddress()); pb.environment().put("port", Integer.toString(getAddress().getPort())); process = pb.start(); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java index 451e3608..83a4683a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java @@ -232,6 +232,7 @@ private YAMLSection build(File dir, ServerTemplate template, List