Skip to content

Fix config file not being read #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix config file not being read #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0b345
Fix config file not being read
keastrid Jan 12, 2025
e6a8b37
Ignore failure to parse some older java version information
keastrid Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 37 additions & 6 deletions src/nativeStub.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,18 @@ int main(int argc, char** argv) {
}

jvmVersion = javaInfo[@"JVMVersion"];
jvmOptionsFile = javaInfo[@"JVMOptionsFile"];
bootstrapScript = javaInfo[@"BootstrapScript"];
if(javaInfo[@"JVMOptionsFile"] != nil) {
NSString *jvmOptFileWithPlaceholders = javaInfo[@"JVMOptionsFile"];
jvmOptionsFile = resolvePlaceholders(jvmOptFileWithPlaceholders, javaFolder);
} else {
jvmOptionsFile = info[@"JVMOptionsFile"];
}
if(javaInfo[@"BootstrapScript"] != nil) {
NSString *bootstrapFileWithPlaceholders = javaInfo[@"BootstrapScript"];
bootstrapScript = resolvePlaceholders(bootstrapFileWithPlaceholders, javaFolder);
} else {
bootstrapScript = info[@"BootstrapScript"];
}
} else {
NSLog(@"[%s] [PlistStyle] Oracle", appName);
javaFolder = [[main bundlePath] stringByAppendingPathComponent:@"Contents/Java"];
Expand Down Expand Up @@ -151,8 +161,18 @@ int main(int argc, char** argv) {
}

jvmVersion = info[@"JVMVersion"];
jvmOptionsFile = info[@"JVMOptionsFile"];
bootstrapScript = info[@"BootstrapScript"];
if(javaInfo[@"JVMOptionsFile"] != nil) {
NSString *jvmOptFileWithPlaceholders = javaInfo[@"JVMOptionsFile"];
jvmOptionsFile = resolvePlaceholders(jvmOptFileWithPlaceholders, javaFolder);
} else {
jvmOptionsFile = info[@"JVMOptionsFile"];
}
if(javaInfo[@"BootstrapScript"] != nil) {
NSString *bootstrapFileWithPlaceholders = javaInfo[@"BootstrapScript"];
bootstrapScript = resolvePlaceholders(bootstrapFileWithPlaceholders, javaFolder);
} else {
bootstrapScript = info[@"BootstrapScript"];
}
}
if([jvmVersion containsString:@";"]) {
NSArray *stringParts = [jvmVersion componentsSeparatedByString:@";"];
Expand Down Expand Up @@ -360,6 +380,10 @@ int main(int argc, char** argv) {
NSString *optionsFile = [[NSString alloc] initWithData:[fileManager contentsAtPath:jvmOptionsFile] encoding:NSUTF8StringEncoding];
NSArray *lines = [optionsFile componentsSeparatedByString:@"\n"];
for(NSString *line in lines) {
// Filter empty lines, otherwise application will fail to start for empty file
if ([line length] == 0) {
continue;
}
if([line hasPrefix:@"#"]) {
continue;
}
Expand Down Expand Up @@ -447,7 +471,14 @@ - (NSString *)description {
NSString *result = execute(path, @[@"-version"]);
// The actual version will be between the first two quotes in the result
// We can reasonably ignore all the rest of the output
return [result componentsSeparatedByString:@"\""][1];
NSArray *components = [result componentsSeparatedByString:@"\""];
if (components.count > 1) {
return components[1];
} else {
// Handle unexpected format
NSLog(@"Error: Unexpected version string format: %@", result);
return nil;
}
}

NSString *normalizeJavaVersion(NSString *version) {
Expand Down Expand Up @@ -521,4 +552,4 @@ BOOL versionMeetsMaxConstraint(NSString *version, NSString *constraint) {
// no modifier means it must match exactly
return !exceeds && [constraintParts count] == [versionParts count];
}
}
}