From 04dbcc04696cde640d003ac342b519c15aba6a72 Mon Sep 17 00:00:00 2001
From: DSR! <xchwarze@gmail.com>
Date: Wed, 11 May 2022 03:40:27 -0300
Subject: [PATCH] Changes in Java installs

---
 bin/installer/sections/extras.iss | 15 ++++++++++-----
 bin/installer/setup.iss           |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/installer/sections/extras.iss b/bin/installer/sections/extras.iss
index ddb8356..6979bfc 100644
--- a/bin/installer/sections/extras.iss
+++ b/bin/installer/sections/extras.iss
@@ -44,22 +44,27 @@ Name: "extras\choco"; Description: "Install Chocolatey package manager"; ExtraDi
 Source: "{#MySrcDir}\bin\choco\*"; DestDir: "{#MyAppBinsFolder}\choco"; Components: "extras\choco"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Run]
-Filename: "{#MyAppBinsFolder}\choco\installChocolatey.cmd"; Components: "extras\choco or extras\javase or extras\python"; Flags: shellexec waituntilterminated;
+Filename: "{#MyAppBinsFolder}\choco\installChocolatey.cmd"; Components: "extras\choco or extras\javajre or extras\javajdk or extras\python"; Flags: shellexec waituntilterminated;
 
 
 
-; Install Java
+; Install Java JRE
 [Components]
-Name: "extras\javase"; Description: "Install Java 8 Runtime Environment (via Chocolatey)"; ExtraDiskSpaceRequired: 220200960; Types: full compact; 
+Name: "extras\javajre"; Description: "Install Java Oracle JRE 8 (via Chocolatey)"; ExtraDiskSpaceRequired: 220200960; Types: full compact; 
 
 [Run]
-Filename: "{sd}\ProgramData\chocolatey\bin\choco.exe"; Parameters: "install -y jre8"; Components: "extras\javase"; Flags: shellexec waituntilterminated;
+Filename: "{sd}\ProgramData\chocolatey\bin\choco.exe"; Parameters: "install -y jre8"; Components: "extras\javajre"; Flags: shellexec waituntilterminated;
 
+; Install Java JDK (for Ghidra!)
+[Components]
+Name: "extras\javajdk"; Description: "Install Java Temurin JDK 11 (via Chocolatey)"; ExtraDiskSpaceRequired: 315621376;
 
+[Run]
+Filename: "{sd}\ProgramData\chocolatey\bin\choco.exe"; Parameters: "install -y temurin11"; Components: "extras\javajdk"; Flags: shellexec waituntilterminated;
 
 ; Install Python
 [Components]
-Name: "extras\python"; Description: "Install Python 3.x (via Chocolatey)"; ExtraDiskSpaceRequired: 104857600; Types: full compact; 
+Name: "extras\python"; Description: "Install Python 3 (via Chocolatey)"; ExtraDiskSpaceRequired: 104857600; Types: full compact; 
 
 [Run]
 Filename: "{sd}\ProgramData\chocolatey\bin\choco.exe"; Parameters: "install -y python"; Components: "extras\python"; Flags: shellexec waituntilterminated;
diff --git a/bin/installer/setup.iss b/bin/installer/setup.iss
index 72942cd..639ec9d 100644
--- a/bin/installer/setup.iss
+++ b/bin/installer/setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Indetectables Toolkit"
-#define MyAppVersion "2022.4"
+#define MyAppVersion "2022.5"
 #define MyAppPublisher "Indetectables"
 #define MyAppURL "https://www.indetectables.net/"
 #define MyAppToolsFolder "{app}\toolkit"
@@ -36,6 +36,7 @@ OutputDir={#MyOutputDir}
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
 
 [Components]
 Name: "analysis"; Description: "Analysis tools"; Types: full;