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

Allow build scripts to reference a template's source files

This commit is contained in:
ME1312 2021-06-16 00:38:00 -04:00
parent dfabbcf4ad
commit ff709ba314
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,17 +178,13 @@ public class InternalSubCreator extends SubCreator {
}
if (template.getBuildOptions().contains("Executable")) {
File cache;
File cache = null;
if (template.getBuildOptions().getBoolean("Use-Cache", true)) {
cache = new UniversalFile(host.plugin.dir, "SubServers:Cache:Templates:" + template.getName());
cache.mkdirs();
String c = cache.toString();
if (System.getProperty("os.name").toLowerCase().startsWith("windows") &&
(template.getBuildOptions().getRawString("Executable").toLowerCase().startsWith("bash ") || template.getBuildOptions().getRawString("Executable").toLowerCase().startsWith("sh "))) c = c.replace(File.separatorChar, '/');
var.put("cache", c);
} else {
cache = null;
var.put("cache", cache.getAbsolutePath());
}
var.put("source", dir.getAbsolutePath());
try {
Logger.get(prefix).info("Launching Build Script...");

10
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java
View File

@ -378,17 +378,13 @@ public class SubCreatorImpl {
}
if (template.getBuildOptions().contains("Executable")) {
File cache;
File cache = null;
if (template.getBuildOptions().getBoolean("Use-Cache", true)) {
cache = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache:Templates:" + template.getName());
cache.mkdirs();
String c = cache.toString();
if (System.getProperty("os.name").toLowerCase().startsWith("windows") &&
(template.getBuildOptions().getRawString("Executable").toLowerCase().startsWith("bash ") || template.getBuildOptions().getRawString("Executable").toLowerCase().startsWith("sh "))) c = c.replace(File.separatorChar, '/');
var.put("cache", c);
} else {
cache = null;
var.put("cache", cache.getAbsolutePath());
}
var.put("source", dir.getAbsolutePath());
try {
log.logger.info.println("Launching Build Script...");