Version 2.0.2

Author: nsiatras

InnoSetup Installer/64Bit-GraalVM-Installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "GraalVM Installer"
-#define MyAppVersion "2.0.1"
+#define MyAppVersion "2.0.2"
 #define MyAppPublisher "SourceRabbit"
 #define MyAppURL "https://www.sourcerabbit.com/"
 #define MyAppExeName "GraalVMInstaller.exe"

NetBeans Project/src/graalvminstallerforwindows/Core/Installer.java

@@ -36,6 +36,7 @@ public class Installer
     private final String fDownloadURL, fInstallationPath;
     private final String fDownloadedZipFilePath;
     private final FileUtils fFileUtils;
+    private boolean fEnvironmentVariablesAreSet = false;
 
     public Installer(String downloadURL, String installationPath)
     {
@@ -151,12 +152,33 @@ public boolean accept(File current, String name)
 
     private boolean STEP5_SetJavaHomePathAndRunJarFix() throws Exception
     {
-        try
+
+        UITools.ShowPleaseWaitDialog("Please wait", "Setting Environment variables...", frmMain.fInstance, () ->
         {
-            EnvironmentVariablesManager.SetEnvironmentVariable("JAVA_HOME", fInstallationPath);
-            EnvironmentVariablesManager.AddEnvironmentVariable("PATH", fInstallationPath + "\\bin");
-        }
-        catch (Exception ex)
+            try
+            {
+                EnvironmentVariablesManager.SetEnvironmentVariable("JAVA_HOME", fInstallationPath);
+                EnvironmentVariablesManager.AddEnvironmentVariable("PATH", fInstallationPath + "\\bin\\");
+                fEnvironmentVariablesAreSet = true;
+            }
+            catch (Exception ex)
+            {
+                fEnvironmentVariablesAreSet = false;
+                return;
+            }
+
+            try
+            {
+                // Wait 2 seconds before run JarFix
+                Thread.sleep(2000);
+            }
+            catch (Exception ex)
+            {
+
+            }
+        });
+
+        if (!fEnvironmentVariablesAreSet)
         {
             throw new Exception("Cannot set environment variables!");
         }
@@ -172,7 +194,7 @@ private boolean STEP5_SetJavaHomePathAndRunJarFix() throws Exception
             // Run jarfix.exe
             final String userDir = System.getProperty("user.dir");
             String jarFixRunCommand = userDir + "\\Prerequisites\\jarfix.exe";
-            DosPromt.ExecuteDOSPromt(jarFixRunCommand);
+            DosPromt.ExecuteDosPromtAndWaitToFinish(jarFixRunCommand);
         }
         catch (IOException ex)
         {

NetBeans Project/src/graalvminstallerforwindows/Core/Settings.java

@@ -21,6 +21,6 @@
 public class Settings
 {
 
-    public static final String fAppVersion = "2.0.1";
+    public static final String fAppVersion = "2.0.2";
     public static final String fDownloadsListFile = "https://raw.githubusercontent.com/SourceRabbit/GraalVM-Windows-Installer/main/Downloads/DownloadsList.txt";
 }

NetBeans Project/src/graalvminstallerforwindows/Core/Utilities/DosPromt.java

@@ -24,7 +24,7 @@
 public class DosPromt
 {
 
-    public static String ExecuteDOSPromt(String command) throws IOException
+    public static String ExecuteDOSPromtAndGetResult(String command) throws IOException
     {
         String result = "";
         ProcessBuilder builder = new ProcessBuilder("cmd.exe", "/c", command);
@@ -44,4 +44,11 @@ public static String ExecuteDOSPromt(String command) throws IOException
 
         return result;
     }
+
+    public static void ExecuteDosPromtAndWaitToFinish(String command) throws InterruptedException, IOException
+    {
+        ProcessBuilder builder = new ProcessBuilder("cmd.exe", "/c", command);
+        Process p = builder.start();
+        int exitVal = p.waitFor();
+    }
 }

NetBeans Project/src/graalvminstallerforwindows/Core/Utilities/EnvironmentVariablesManager.java

@@ -1,7 +1,6 @@
 package graalvminstallerforwindows.Core.Utilities;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.stream.Collectors;
 
 
@@ -24,39 +23,39 @@
  */
 public class EnvironmentVariablesManager
 {
-    
+
     public EnvironmentVariablesManager()
     {
-        
+
     }
-    
+
     public static void SetEnvironmentVariable(String variable, String value) throws Exception
     {
-        final String dosCommand = "setx " + variable + " \"" + value + ";" + "\"";
-        DosPromt.ExecuteDOSPromt(dosCommand);
-        
+        final String dosCommand = "setx /M " + variable + " \"" + value + "\"";
+        DosPromt.ExecuteDosPromtAndWaitToFinish(dosCommand);
     }
-    
+
     public static void AddEnvironmentVariable(String variable, String value) throws Exception
     {
-        final String[] currentValues = DosPromt.ExecuteDOSPromt("echo %" + variable + "%").split(";");
+        final String[] currentValues = DosPromt.ExecuteDOSPromtAndGetResult("echo %" + variable + "%").split(";");
 
-        // C:\Development\GraalVM-Windows-Installer\NetBeans Project\00_Release\jre\bin
-        final String userDir = System.getProperty("user.dir");
+        final String appPath = System.getProperty("user.dir");
         ArrayList<String> finalValues = new ArrayList<>();
         for (String s : currentValues)
         {
-            if (!s.equals("null") && !s.equals("") && !s.equals(value) && !finalValues.contains(s) && !s.startsWith(userDir))
+            if (!s.equals("null") && !s.equals("") && !s.equals(value) && !finalValues.contains(s) && !s.startsWith(appPath) && !s.contains("\""))
             {
                 finalValues.add(s);
             }
         }
         finalValues.add(value);
-        
-        final String newValuesString = finalValues.stream().collect(Collectors.joining(";"));
 
-        //final String currentVariableValuesString = System.getenv(variable);
-        SetEnvironmentVariable(variable, newValuesString);
+        // CAUTION --  ADD ';' at the end!
+        final String newValuesString = finalValues.stream().collect(Collectors.joining(";")) + ";";
+
+        final String dosCommand = "setx /M " + variable + " \"" + newValuesString + "\"";
+        DosPromt.ExecuteDosPromtAndWaitToFinish(dosCommand);
+
     }
-    
+
 }