Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#41 Add `host` to the environment

This commit is contained in:
ME1312 2019-05-02 12:10:01 -04:00
parent df029e3a7e
commit f8d597f513
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
View File

@ -87,6 +87,7 @@ public class InternalSubCreator extends SubCreator {
System.out.println(name + File.separator + "Creator > 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());

1
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
View File

@ -121,6 +121,7 @@ public class InternalSubServer extends SubServerContainer {
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();

1
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
View File

@ -232,6 +232,7 @@ public class SubCreator {
host.subdata.sendPacket(new PacketOutExLogMessage(address, "Loading Template: " + template.getDisplayName()));
Util.copyDirectory(template.getDirectory(), dir);
var.put("name", name);
if (host.subdata != null) var.put("host", host.subdata.getName());
var.put("template", template.getName());
var.put("type", template.getType().toString().toUpperCase());
var.put("version", version.toString());

1
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
View File

@ -110,6 +110,7 @@ public class SubServer {
try {
ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.host.getRawString("Git-Bash"), executable)).directory(directory);
pb.environment().put("name", getName());
if (host.subdata != null) pb.environment().put("host", host.subdata.getName());
pb.environment().put("address", host.config.get().getSection("Settings").getRawString("Server-Bind"));
pb.environment().put("port", Integer.toString(getPort()));
process = pb.start();