From c4c3c36b8c47defca38e122bab5bd4974c4bd24f Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 20 Aug 2021 19:32:44 +0200 Subject: [PATCH] stuff --- .../extensiondetails/StoreExtensionDetailsItem.java | 4 ++-- .../extensionstore/tools/StoreExtensionTools.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java index 7d66ef7..63e9715 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java @@ -98,10 +98,10 @@ public class StoreExtensionDetailsItem implements ContentItem { if (storeExtension.getFramework().getFramework().isInstallationRequired()) { contentBuilder.append("Warning: the framework requires --url:additional installations-") - .append(storeExtension.getFramework().getFramework().getInstallationInstructions()).append(" !\n"); + .append(storeExtension.getFramework().getFramework().getInstallationInstructions()).append(" !\n\n"); } if (!storeExtension.isStable()) { - contentBuilder.append("Warning: this extension has been marked unstable!\n"); + contentBuilder.append("Warning: this extension has been marked unstable!\n\n"); } contentBuilder.append("\n*Screenshot: *").append("\n") diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java index ba76de3..e809c63 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java @@ -94,8 +94,7 @@ public class StoreExtensionTools { } zipInputStream.closeEntry(); zipInputStream.close(); - - + inputStream.close(); } @@ -126,10 +125,17 @@ public class StoreExtensionTools { List command = OSValidator.isMac() ? ext.getCommands().getMac() : (OSValidator.isUnix() ? ext.getCommands().getLinux() : (OSValidator.isWindows() ? ext.getCommands().getWindows() : ext.getCommands().getDefault())); command = command == null ? ext.getCommands().getDefault() : command; + +// String commandRaw = new JSONArray(command).toString(); +// PrintWriter out = new PrintWriter(Paths.get(path, "command.txt").toString()); +// out.println(commandRaw); +// out.close(); + FileUtils.writeStringToFile(commandFile, new JSONArray(command).toString(), "UTF-8"); listener.success(path); } catch (IOException e) { + e.printStackTrace(); listener.fail("Error while unzipping"); removeExtension(path); }