Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-22 10:15:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix cache bug when spaces are in the file path

Browse Source
This commit is contained in:
ME1312 2018-04-07 16:42:09 -04:00
parent 74ddbc9bd4
commit 69bb3d299a
20 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Artifacts/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Host.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Sync.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Host.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Sync.jar
View File

Binary file not shown.

BIN
SubServers.Bungee/src.jar
View File

Binary file not shown.

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

@ -161,7 +161,7 @@ public class InternalSubCreator extends SubCreator {
try { try {
System.out.println(name + File.separator + "Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location")); System.out.println(name + File.separator + "Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location"));
thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"cmd.exe /c \"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " \"" + ((cache == null)?':':cache.toString().replace('\\', '/')) + "\"\"\"":("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " \"" + ((cache == null)?':':cache.toString()) + '\"'), null, dir)); thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"cmd.exe /c \"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + ' ' + ((cache == null)?':':cache.toString().replace('\\', '/').replace(" ", "\\ ")) + "\"\"":("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + ' ' + ((cache == null)?':':cache.toString().replace(" ", "\\ "))), null, dir));
thread.name().log.set(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator")); thread.name().log.set(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator"));
thread.name().file = new File(dir, "SubCreator-" + template.getName() + "-" + version.toString().replace(" ", "@") + ".log"); thread.name().file = new File(dir, "SubCreator-" + template.getName() + "-" + version.toString().replace(" ", "@") + ".log");
thread.name().process = thread.get(); thread.name().process = thread.get();

BIN
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip
View File

Binary file not shown.

BIN
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip
View File

Binary file not shown.

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
View File

@ -60,7 +60,7 @@ public final class SubPlugin extends BungeeCord implements Listener {
public SubServer sudo = null; public SubServer sudo = null;
//public static final Version version = new Version("2.13a"); //public static final Version version = new Version("2.13a");
//public static final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting //public static final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting
public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 7); // TODO Beta Version Setting public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 8); // TODO Beta Version Setting
public boolean redis = false; public boolean redis = false;
public long resetDate = 0; public long resetDate = 0;

BIN
SubServers.Client/Bukkit/src.jar
View File

Binary file not shown.

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View File

@ -47,7 +47,7 @@ public final class SubPlugin extends JavaPlugin {
super(); super();
//version = new Version(getDescription().getVersion()); //version = new Version(getDescription().getVersion());
//version = new Version(new Version(getDescription().getVersion()), Version.VersionType.BETA, 1); // TODO Beta Version Setting //version = new Version(new Version(getDescription().getVersion()), Version.VersionType.BETA, 1); // TODO Beta Version Setting
version = new Version(new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 2), VersionType.BETA, 7); // TODO Beta Version Setting version = new Version(new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 2), VersionType.BETA, 8); // TODO Beta Version Setting
} }
/** /**

BIN
SubServers.Host/src.jar
View File

Binary file not shown.

2
SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
View File

@ -53,7 +53,7 @@ public final class ExHost {
//public final Version version = new Version("2.13a"); //public final Version version = new Version("2.13a");
//public final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting //public final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting
public final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 7); // TODO Beta Version Setting public final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 8); // TODO Beta Version Setting
public final SubAPI api = new SubAPI(this); public final SubAPI api = new SubAPI(this);
private ConsoleReader jline; private ConsoleReader jline;

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

@ -289,7 +289,7 @@ public class SubCreator {
try { try {
thread.name().logger.info.println("Launching " + template.getBuildOptions().getRawString("Shell-Location")); thread.name().logger.info.println("Launching " + template.getBuildOptions().getRawString("Shell-Location"));
host.subdata.sendPacket(new PacketOutExLogMessage(address, "Launching " + template.getBuildOptions().getRawString("Shell-Location"))); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Launching " + template.getBuildOptions().getRawString("Shell-Location")));
thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"cmd.exe /c \"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " \"" + ((cache == null)?':':cache.toString().replace('\\', '/')) + "\"\"\"":("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " \"" + ((cache == null)?':':cache.toString()) + '\"'), null, dir)); thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"cmd.exe /c \"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + ' ' + ((cache == null)?':':cache.toString().replace('\\', '/').replace(" ", "\\ ")) + "\"\"":("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + ' ' + ((cache == null)?':':cache.toString().replace(" ", "\\ "))), null, dir));
thread.name().file = new File(dir, "SubCreator-" + template.getName() + "-" + version.toString().replace(" ", "@") + ".log"); thread.name().file = new File(dir, "SubCreator-" + template.getName() + "-" + version.toString().replace(" ", "@") + ".log");
thread.name().process = thread.get(); thread.name().process = thread.get();
thread.name().start(); thread.name().start();

BIN
SubServers.Sync/src.jar
View File

Binary file not shown.

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
View File

@ -50,7 +50,7 @@ public final class SubPlugin extends BungeeCord implements Listener {
public SubDataClient subdata = null; public SubDataClient subdata = null;
//public static final Version version = new Version("2.13a"); //public static final Version version = new Version("2.13a");
//public static final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting //public static final Version version = new Version(new Version("2.13a"), Version.VersionType.BETA, 1); // TODO Beta Version Setting
public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 7); // TODO Beta Version Setting public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 2), VersionType.BETA, 8); // TODO Beta Version Setting
public long lastReload = -1; public long lastReload = -1;