From 28a7f5b94b366b361ee79dd6a1330f4f4dc634d8 Mon Sep 17 00:00:00 2001 From: John Klay Date: Tue, 30 Mar 2021 12:07:06 -0400 Subject: [PATCH 1/2] Fix permission issue with FutureRestoreWorker, also fix dep for wiping --- src/main/java/FutureRestoreWorker.java | 6 +++++- src/main/{ => resources}/META-INF/MANIFEST.MF | 0 2 files changed, 5 insertions(+), 1 deletion(-) rename src/main/{ => resources}/META-INF/MANIFEST.MF (100%) diff --git a/src/main/java/FutureRestoreWorker.java b/src/main/java/FutureRestoreWorker.java index 3db6237..06bd62b 100644 --- a/src/main/java/FutureRestoreWorker.java +++ b/src/main/java/FutureRestoreWorker.java @@ -29,9 +29,14 @@ static void runFutureRestore(String futureRestoreFilePath, ArrayList all argsAndFR.add(0, futureRestoreFilePath); String[] allArgsArray = Arrays.copyOf(argsAndFR.toArray(), argsAndFR.toArray().length, String[].class); + String homeDirectory = System.getProperty("user.home"); + File frGuiDirectory = new File(homeDirectory + "/FutureRestoreGUI"); + ProcessBuilder processBuilder = new ProcessBuilder(); processBuilder.command(allArgsArray); processBuilder.redirectErrorStream(true); + processBuilder.directory(frGuiDirectory); + futureRestoreProcess = processBuilder.start(); futureRestoreProcess.getOutputStream().close(); @@ -41,7 +46,6 @@ static void runFutureRestore(String futureRestoreFilePath, ArrayList all BufferedReader reader = new BufferedReader(new InputStreamReader(futureRestoreProcess.getInputStream())); //Log automatically - String homeDirectory = System.getProperty("user.home"); File frGuiLogsDirectory = new File(homeDirectory + "/FutureRestoreGUI/logs"); if (!frGuiLogsDirectory.exists()) frGuiLogsDirectory.mkdir(); diff --git a/src/main/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from src/main/META-INF/MANIFEST.MF rename to src/main/resources/META-INF/MANIFEST.MF From 7340d948f4581cea729ff398192aae85fbd0631a Mon Sep 17 00:00:00 2001 From: John Klay Date: Tue, 30 Mar 2021 12:09:21 -0400 Subject: [PATCH 2/2] And increment version # --- src/main/java/MainMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/MainMenu.java b/src/main/java/MainMenu.java index 011f9a7..97b4254 100644 --- a/src/main/java/MainMenu.java +++ b/src/main/java/MainMenu.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; public class MainMenu { - static String futureRestoreGUIVersion = "1.71"; + static String futureRestoreGUIVersion = "1.72"; private JButton selectBlobFileButton; private JButton selectTargetIPSWFileButton;