+ * If isModal == true then aRunnable will only be executed after the msgPanel has been accepted. + *
+ * The runnable will not be run until the parentFrame is visible. + */ + private void displayNoticeAndExecute(final String aMsg, final Runnable aRunnable, final boolean isModal) + { + // Transform tabs to 3 spaces + final String infoMsg = aMsg.replace("\t", " "); + + // If the parentFrame is not visible then execute the code once it is made visible if (parentFrame.isVisible() == false) { - final String tmpMsg = aMsg; parentFrame.addComponentListener(new ComponentAdapter() { @Override public void componentShown(ComponentEvent aEvent) { + // Show the message panel and wait for user to close panel msgPanel.setTitle("Application Updater"); - msgPanel.setInfo(tmpMsg); - msgPanel.setVisible(true); + msgPanel.setInfo(infoMsg); + if (isModal == true) + msgPanel.setVisibleAsModal(); + else + msgPanel.setVisible(true); + + // Execute aRunnable's logic + aRunnable.run(); // Deregister for events after the parentFrame is made visible parentFrame.removeComponentListener(this); @@ -392,13 +418,16 @@ public class DistMakerEngine return; } - // Transform tabs to 3 spaces - aMsg = aMsg.replace("\t", " "); - - // Display the message + // Show the message panel and wait for user to close panel msgPanel.setTitle("Application Updater"); - msgPanel.setInfo(aMsg); - msgPanel.setVisible(true); + msgPanel.setInfo(infoMsg); + if (isModal == true) + msgPanel.setVisibleAsModal(); + else + msgPanel.setVisible(true); + + // Execute aRunnable's logic + aRunnable.run(); } /** @@ -538,7 +567,7 @@ public class DistMakerEngine catch(ErrorDM aExp) { aTask.infoAppendln("Failed updating application configuration."); - printErrorDM(aTask, aExp, 1); + MiscUtils.printErrorDM(aTask, aExp, 1); return false; } @@ -557,8 +586,8 @@ public class DistMakerEngine tmpFW.write("# Define the fail section (clean up for failure)\n"); tmpFW.write("sect,fail\n"); tmpFW.write("copy," + "delta/" + appCfgFile.getName() + ".old," + MiscUtils.getRelativePath(rootPath, appCfgFile) + "\n"); - tmpFW.write("move,jre" + targJreVer.getLabel() + ",delta" + "\n"); - tmpFW.write("reboot\n\n"); + tmpFW.write("reboot,trash,jre" + targJreVer.getLabel() + "\n"); + tmpFW.write("exit\n\n"); tmpFW.write("# Define the pass section (clean up for success)\n"); tmpFW.write("sect,pass\n"); @@ -630,7 +659,7 @@ public class DistMakerEngine aTask.infoAppendln("Failed to update the configuration to point to the updated JRE!"); aTask.infoAppendln("\tCurrent JRE: " + currJreVer.getLabel()); aTask.infoAppendln("\t Chosen JRE: " + targJre.getVersion().getLabel()); - printErrorDM(aTask, aExp, 1); + MiscUtils.printErrorDM(aTask, aExp, 1); // Remove the just installed JRE IoUtil.deleteDirectory(jreTargPath); @@ -771,71 +800,134 @@ public class DistMakerEngine } /** - * Notification that the corresponding application has been fully initialized. This helper method will notify the user on the status of any update. - */ - private void markSystemFullyStarted() - { - String appName, msg; - int updateCode; - - updateCode = DistUtils.getUpdateCode(); - appName = currRelease.getName(); - - // No update - if (updateCode == 0) - { - return; - } - // Update passed - else if (updateCode == 1) - { - msg = "The application, " + currRelease.getName() + ", has been updated to "; - msg += "version: " + currRelease.getVersion(); - } - // Update failed - else - // if (updateCode == 2) - { - msg = "There was an issue while updating the " + appName + " application.\n"; - msg += "The application, " + appName + ", is currently at version: " + currRelease.getVersion() + "\n\n"; - - msg += DistUtils.getUpdateMsg(); - } - - displayNotice(msg); - } - - /** - * Helper method that prints the exception of ErrorDM in an intelligent fashion to the specified task. + * Helper method that "reverts" an update. After this method is called the DistMaker application's configuration should be in the same state as before an + * update was applied. Reverting consists of the following: + *
- * All ErrorDM exceptions (and their causes) will be printed. If the cause is not of type ErrorDM then the stack trace will be printed as well. + * There should not be any issues with this roll back process. However if there are a best effort will be made to continue rolling back the updates - note + * that the application might be in an unstable state - and may not be able to be restarted. */ - private void printErrorDM(Task aTask, ErrorDM aErrorDM, int numTabs) + private void revertUpdate(Task aTask) { - Throwable cause; - String tabStr; - - tabStr = Strings.repeat("\t", numTabs); - - aTask.infoAppendln(tabStr + "Reason: " + aErrorDM.getMessage()); - cause = aErrorDM.getCause(); - while (cause != null) + // Revert our application's configuration (which will be loaded when it is restarted) to reflect the proper JRE + try { - if (cause instanceof ErrorDM) - { - aTask.infoAppendln(tabStr + "Reason: " + cause.getMessage()); - } - else - { - aTask.infoAppendln(tabStr + "StackTrace: "); - aTask.infoAppendln(ThreadUtil.getStackTrace(cause)); - break; - } - - cause = aErrorDM.getCause(); + JreVersion currJreVer = DistUtils.getJreVersion(); + PlatformUtils.setJreVersion(currJreVer); + } + catch(ErrorDM aExp) + { + aTask.infoAppendln("Failed to revert application's JRE!"); + aTask.infoAppendln("\tApplication may be in an unstable state."); + MiscUtils.printErrorDM(aTask, aExp, 1); } - aTask.infoAppendln(""); + // Revert any platform specific config files + try + { + PlatformUtils.updateAppRelease(currRelease); + } + catch(ErrorDM aExp) + { + aTask.infoAppendln("Failed to revert application configuration!"); + aTask.infoAppendln("\tApplication may be in an unstable state."); + MiscUtils.printErrorDM(aTask, aExp, 1); + } + + // Determine the path to the delta (update) folder + File rootPath = DistUtils.getAppPath().getParentFile(); + File deltaPath = new File(rootPath, "delta"); + + // It is necessary to do this, since the user may later cancel the update request and it is important to + // leave the program and configuration files in a stable state. + + // Execute any trash commands from the "fail" section of the delta.cmd file + File deltaCmdFile = new File(deltaPath, "delta.cmd"); + try (BufferedReader br = MiscUtils.openFileAsBufferedReader(deltaCmdFile)) + { + String currSect = null; + while (true) + { + String inputStr = br.readLine(); + + // Delta command files should always have a proper exit and thus never arrive here + if (inputStr == null) + throw new ErrorDM("Command file (" + deltaCmdFile + ") is incomplete."); + + // Ignore empty lines and comments + if (inputStr.isEmpty() == true || inputStr.startsWith("#") == true) + continue; + + // Tokenize the input and retrieve the command + String[] strArr = inputStr.split(","); + String cmdStr = strArr[0]; + + // Skip to next line when we read a new section + if (strArr.length == 2 && cmdStr.equals("sect") == true) + { + currSect = strArr[1]; + continue; + } + + // Skip to the next line if we are not in the "fail" section + if (currSect != null && currSect.equals("fail") == false) + continue; + else if (currSect == null) + throw new ErrorDM("Command specified outside of section. Command: " + inputStr); + + // Bail if we reach the exit command + if (strArr.length == 1 && cmdStr.equals("exit") == true) + break; + + // We are interested only in trash (or reboot,trash) commands. Execute the individual trash (or reboot,trash) commands. + // It is safe to execute reboot,trash commands now since the actual update is not running yet. + String delTargStr = null; + if (inputStr.startsWith("trash,") == true) + delTargStr = inputStr.substring(6); + else if (inputStr.startsWith("reboot,trash,") == true) + delTargStr = inputStr.substring(13); + else + continue; + + // Ensure we are not looking at a "hollow" trash command + if (delTargStr.isEmpty() == true) + throw new ErrorDM("File (" + deltaCmdFile + ") has invalid input: " + inputStr); + + // Resolve the argument to the corresponding file and ensure it is relative to our rootPath + File trashFile = new File(rootPath, delTargStr).getCanonicalFile(); + if (MiscUtils.getRelativePath(rootPath, trashFile) == null) + throw new ErrorDM("File (" + trashFile + ") is not relative to folder: " + rootPath); + + if (trashFile.isFile() == true) + { + if (trashFile.delete() == false) + throw new ErrorDM("Failed to delete file: " + trashFile); + } + else if (trashFile.isDirectory() == true) + { + if (IoUtil.deleteDirectory(trashFile) == false) + throw new ErrorDM("Failed to delete folder: " + trashFile); + } + else + { + throw new ErrorDM("File type is not recognized: " + trashFile); + } + } + } + catch(IOException aExp) + { + aTask.infoAppendln("Failed to revert application configuration!"); + aTask.infoAppendln("\tApplication may be in an unstable state."); + aTask.infoAppendln(ThreadUtil.getStackTrace(aExp)); + } + + // Remove the entire delta folder + if (IoUtil.deleteDirectory(deltaPath) == false) + throw new ErrorDM("Failed to delete folder: " + deltaPath); } /** @@ -878,126 +970,52 @@ public class DistMakerEngine } /** - * Helper method that "reverts" an update. After this method is called the DistMaker application's configuration should be in the same state as before an - * update was applied. Reverting consists of the following: - *
- * There should not be any issues with this roll back process. However if there are a best effort will be made to continue rolling back the updates - note - * that the application might be in an unstable state - and may not be able to be restarted. + * Notification that the corresponding application has been fully initialized. This helper method will notify the user on the status of any update. */ - private void revertUpdate(Task aTask) + private void showUpdateResults() { - // Revert our application's configuration (which will be loaded when it is restarted) to reflect the proper JRE - try + String appName, infoMsg; + int updateCode; + + updateCode = DistUtils.getUpdateCode(); + appName = currRelease.getName(); + + // No update + if (updateCode == 0) { - JreVersion currJreVer = DistUtils.getJreVersion(); - PlatformUtils.setJreVersion(currJreVer); + return; } - catch(ErrorDM aExp) + // Update passed + else if (updateCode == 1) { - aTask.infoAppendln("Failed to revert application's JRE!"); - aTask.infoAppendln("\tApplication may be in an unstable state."); - printErrorDM(aTask, aExp, 1); + infoMsg = "The application, " + currRelease.getName() + ", has been updated to "; + infoMsg += "version: " + currRelease.getVersion(); + } + // Update failed + else + { + infoMsg = "There was an issue while updating the " + appName + " application.\n"; + infoMsg += "The application, " + appName + ", is currently at version: " + currRelease.getVersion() + "\n\n"; + infoMsg += DistUtils.getUpdateMsg(); } - // Revert any platform specific config files - try - { - PlatformUtils.updateAppRelease(currRelease); - } - catch(ErrorDM aExp) - { - aTask.infoAppendln("Failed to revert application configuration!"); - aTask.infoAppendln("\tApplication may be in an unstable state."); - printErrorDM(aTask, aExp, 1); - } - - // Determine the path to the delta (update) folder - File rootPath = DistUtils.getAppPath().getParentFile(); - File deltaPath = new File(rootPath, "delta"); - - // It is necessary to do this, since the user may later cancel the update request and it is important to - // leave the program and configuration files in a stable state. - - // Execute any trash commands from the "fail" section of the delta.cmd file - File deltaCmdFile = new File(deltaPath, "delta.cmd"); - try (BufferedReader br = MiscUtils.openFileAsBufferedReader(deltaCmdFile)) - { - String currSect = null; - while (true) + // Setup the runnable that will clean up our delta folder + Runnable cleanDeltaRunnable = new Runnable() { + @Override + public void run() { - String inputStr = br.readLine(); + // Remove the delta folder (if it exists) + File deltaPath = new File(DistUtils.getAppPath().getParentFile(), "delta"); + if (deltaPath.isDirectory() == false) + return; - // Delta command files should always have a proper exit (or reboot) and thus never arrive here - if (inputStr == null) - throw new ErrorDM("Command file (" + deltaCmdFile + ") is incomplete."); - - // Ignore empty lines and comments - if (inputStr.isEmpty() == true || inputStr.startsWith("#") == true) - continue; - - // Tokenize the input and retrieve the command - String[] strArr = inputStr.split(","); - String cmdStr = strArr[0]; - - // Skip to next line when we read a new section - if (strArr.length == 2 && cmdStr.equals("sect") == true) - { - currSect = strArr[1]; - continue; - } - - // Skip to the next line if we are not in the "fail" section - if (currSect != null && currSect.equals("fail") == false) - continue; - else if (currSect == null) - throw new ErrorDM("Command specified outside of section. Command: " + inputStr); - - // Exit if we reach the exit or reboot command - if (strArr.length == 1 && cmdStr.equals("exit") == true) - break; - else if (strArr.length == 1 && cmdStr.equals("reboot") == true) - break; - - // Execute the individual (trash) commands - if (strArr.length == 2 && cmdStr.equals("trash") == true) - { - // Resolve the argument to the corresponding file and ensure it is relative to our rootPath - File tmpFile = new File(rootPath, strArr[1]).getCanonicalFile(); - if (MiscUtils.getRelativePath(rootPath, tmpFile) == null) - throw new ErrorDM("File (" + tmpFile + ") is not relative to folder: " + rootPath); - - if (tmpFile.isFile() == true) - { - if (tmpFile.delete() == false) - throw new ErrorDM("Failed to delete file: " + tmpFile); - } - else if (tmpFile.isDirectory() == true) - { - if (IoUtil.deleteDirectory(tmpFile) == false) - throw new ErrorDM("Failed to delete folder: " + tmpFile); - } - else - { - throw new ErrorDM("File type is not recognized: " + tmpFile); - } - } + if (IoUtil.deleteDirectory(deltaPath) == false) + System.err.println("Failed to remove delta path. Cleanup after update was not fully completed."); } - } - catch(IOException aExp) - { - aTask.infoAppendln("Failed to revert application configuration!"); - aTask.infoAppendln("\tApplication may be in an unstable state."); - aTask.infoAppendln(ThreadUtil.getStackTrace(aExp)); - } + }; - // Remove the entire delta folder - if (IoUtil.deleteDirectory(deltaPath) == false) - throw new ErrorDM("Failed to delete folder: " + deltaPath); + // Show the message panel and execute cleanDeltaRunnable + displayNoticeAndExecute(infoMsg, cleanDeltaRunnable, true); } } diff --git a/src/distMaker/MiscUtils.java b/src/distMaker/MiscUtils.java index ddaa81a..a30390a 100644 --- a/src/distMaker/MiscUtils.java +++ b/src/distMaker/MiscUtils.java @@ -1,6 +1,7 @@ package distMaker; import glum.task.Task; +import glum.util.ThreadUtil; import java.io.*; import java.nio.file.Files; @@ -16,6 +17,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.utils.IOUtils; +import com.google.common.base.Strings; import com.google.common.io.CountingInputStream; /** @@ -82,6 +84,39 @@ public class MiscUtils return new BufferedReader(new InputStreamReader(new FileInputStream(aFile))); } + /** + * Helper method that prints the exception of ErrorDM in an intelligent fashion to the specified task. + *
+ * All ErrorDM exceptions (and their causes) will be printed. If the cause is not of type ErrorDM then the stack trace will be printed as well. + */ + public static void printErrorDM(Task aTask, ErrorDM aErrorDM, int numTabs) + { + Throwable cause; + String tabStr; + + tabStr = Strings.repeat("\t", numTabs); + + aTask.infoAppendln(tabStr + "Reason: " + aErrorDM.getMessage()); + cause = aErrorDM.getCause(); + while (cause != null) + { + if (cause instanceof ErrorDM) + { + aTask.infoAppendln(tabStr + "Reason: " + cause.getMessage()); + } + else + { + aTask.infoAppendln(tabStr + "StackTrace: "); + aTask.infoAppendln(ThreadUtil.getStackTrace(cause)); + break; + } + + cause = aErrorDM.getCause(); + } + + aTask.infoAppendln(""); + } + /** * Untar an input file into an output file. *
@@ -138,10 +173,20 @@ public class MiscUtils
else if (entry.isSymbolicLink() == true)
{
File tmpFile = new File(entry.getLinkName());
- Path outLink = Files.createSymbolicLink(outputFile.toPath(), tmpFile.toPath());
+ Files.createSymbolicLink(outputFile.toPath(), tmpFile.toPath());
- long tmpUtc = entry.getModTime().getTime();
- outputFile.setLastModified(tmpUtc);
+// long tmpUtc = entry.getModTime().getTime();
+// outputFile.setLastModified(tmpUtc);
+// // TODO: In the future if you want the symbolic link to have the same time as that in the tar do something like the below
+// // since in Java (as of 1.8) it is impossible to set the time on the link rather than the target
+// Path outLink = Files.createSymbolicLink(outputFile.toPath(), tmpFile.toPath());
+// if (PlatformUtils.getPlatform().equals("Linux") == true)
+// {
+// DateUnit dUnit = new DateUnit("", "yyyyMMddHHmmss");
+// long tmpUtc = entry.getModTime().getTime();
+// String timeStamp = dUnit.getString(tmpUtc);
+// Runtime.getRuntime().exec("touch -h -t " + timeStamp + " " + outLink.toAbsolutePath());
+// }
}
else if (entry.isFile() == true)
{
diff --git a/src/distMaker/platform/AppleUtils.java b/src/distMaker/platform/AppleUtils.java
index fc49dd9..1315f55 100644
--- a/src/distMaker/platform/AppleUtils.java
+++ b/src/distMaker/platform/AppleUtils.java
@@ -213,7 +213,6 @@ public class AppleUtils
Node childNode, targNode;
Element evalE, arrE, memE;
String tagStr, valStr, currKeyVal;
- int zzz_Clean_this;
// Bail if the pFile is not writable.
if (pFile.setWritable(true) == false)
@@ -242,10 +241,7 @@ public class AppleUtils
{
childNode = childList.item(c1);
if (childNode.getNodeType() != Node.ELEMENT_NODE)
- {
-// System.out.println("" + c1 + ": nodeType: " + childNode.getNodeType());
continue;
- }
evalE = (Element)childNode;
tagStr = evalE.getTagName();
diff --git a/template/appLauncher.jar b/template/appLauncher.jar
index d6ef2a801c85b97fd3464552f95c89148844a1b8..5686235181a0f01b222e453fe21dce344f57e5e7 100644
GIT binary patch
delta 7154
zcmaiZRZtv2vo-D#BuKD8kl-FXxGpU2?z%V&1X+T+E$&WmmqmjH3GNVFgF^@|H_2DG
zzFYsxKl5--&vf;4b)A=~vt9>3(GHKT0zgC}ghN9^gA)LiCt%AWDxjCvX>+3d#fB&p
zR)l|~9ql#7KQe=l^`Db1LRBP0B)f8G6bc3O93KU$ONt3enrnK=)#Wm#CrAkfAzA8R
z(;~r(V+UG-f~b#G49fd<09=U{TPzOqhWhqRdZ}6}c+#0|8+rsR7*%>I`Zx1hpoelp
z-!41Q!|^Z8gpL>3I$ydxNoDuPkh`w4HMa?o{U2`6`&kte6!)7(a5Fn&aKeF?Ha