AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark jspawnhelper as executable.

Browse Source 
Closes #74.
This commit is contained in:
Michael Bayne
2016-11-11 07:57:36 -08:00
parent e9d07f3055
commit 1053a11c46
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/getdown/launcher/Getdown.java
+22 -16
View File
@@ -647,21 +647,10 @@ public abstract class Getdown extends Thread
} }
vmjar.markAsValid(); vmjar.markAsValid();
// Sun, why dost thou spite me? Java doesn't know anything about file permissions (and by // these only run on non-Windows platforms, so we use Unix file separators
// extension then, neither does Jar), so on Joonix we have to hackily make java_vm/bin/java String localJavaDir = LaunchUtil.LOCAL_JAVA_DIR + "/";
// executable by execing chmod; a pox on their children! makeExecutable(localJavaDir + "bin/java");
if (!RunAnywhere.isWindows()) { makeExecutable(localJavaDir + "lib/amd64/jspawnhelper");
String vmbin = LaunchUtil.LOCAL_JAVA_DIR + File.separator + "bin" +
File.separator + "java";
String cmd = "chmod a+rx " + _app.getLocalPath(vmbin);
try {
log.info("Please smack a Java engineer. Running: " + cmd);
Runtime.getRuntime().exec(cmd);
} catch (Exception e) {
log.warning("Failed to mark VM binary as executable", "cmd", cmd, "error", e);
// we should do something like tell the user or something but fucking fuck
}
}
// lastly regenerate the .jsa dump file that helps Java to start up faster // lastly regenerate the .jsa dump file that helps Java to start up faster
String vmpath = LaunchUtil.getJVMPath(_app.getLocalPath("")); String vmpath = LaunchUtil.getJVMPath(_app.getLocalPath(""));
@@ -669,12 +658,29 @@ public abstract class Getdown extends Thread
log.info("Regenerating classes.jsa for " + vmpath + "..."); log.info("Regenerating classes.jsa for " + vmpath + "...");
Runtime.getRuntime().exec(vmpath + " -Xshare:dump"); Runtime.getRuntime().exec(vmpath + " -Xshare:dump");
} catch (Exception e) { } catch (Exception e) {
log.warning("Failed to regenerate .jsa dum file", "error", e); log.warning("Failed to regenerate .jsa dump file", "error", e);
} }
reportTrackingEvent("jvm_complete", -1); reportTrackingEvent("jvm_complete", -1);
} }
protected void makeExecutable (String path) {
// Java doesn't know anything about file permissions (and by extension then,
// neither does Jar), so on Unix we have to hackily do so via chmod
if (!RunAnywhere.isWindows()) {
File target = _app.getLocalPath(path);
String cmd = "chmod a+rx " + target;
try {
if (target.exists()) {
log.info("Running: " + cmd);
Runtime.getRuntime().exec(cmd);
}
} catch (Exception e) {
log.warning("Failed to mark VM binary as executable", "cmd", cmd, "error", e);
}
}
}
/** /**
* Called if the application is determined to be of an old version. * Called if the application is determined to be of an old version.
*/ */