Fix newer version scheme for java_home calling (TheInfiniteKind#55)

Vampire · Nov 20, 2023 · ca47f06 · ca47f06
1 parent a4d5efb
commit ca47f06
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/appbundler/native/main.m b/appbundler/native/main.m
@@ -817,7 +817,9 @@ int launch(char *commandName, int progargc, char *progargv[]) {
         NSTask *task = [[NSTask alloc] init];
         [task setLaunchPath:@"/usr/libexec/java_home"];
 
-        NSArray *args = [NSArray arrayWithObjects: @"-v", [NSString stringWithFormat:@"1.%i%@", jvmRequired, exactMatch?@"":@"+"], nil];
+        NSString *versionPattern = (jvmRequired > 8) ? @"%i%@" : @"1.%i%@";
+
+        NSArray *args = [NSArray arrayWithObjects: @"-v", [NSString stringWithFormat:versionPattern, jvmRequired, exactMatch?@"":@"+"], nil];
         [task setArguments:args];
 
         NSPipe *stdout = [NSPipe pipe];