diff --git a/build/conf/mac/Contents/MacOS/idea b/build/conf/mac/Contents/MacOS/idea index dd2b1ac71099..6ba553f866fd 100755 Binary files a/build/conf/mac/Contents/MacOS/idea and b/build/conf/mac/Contents/MacOS/idea differ diff --git a/native/MacLauncher/Launcher.m b/native/MacLauncher/Launcher.m index 354a15c5b44e..630cf741fdab 100644 --- a/native/MacLauncher/Launcher.m +++ b/native/MacLauncher/Launcher.m @@ -226,10 +226,23 @@ NSString *getDefaultPropertiesFilePath() { return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/bin/idea.properties"]; } -NSString *getDefaultVMOptionsFilePath() { - return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/bin/idea.vmoptions"]; +// NSString *getDefaultVMOptionsFilePath() { +// return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@fileName]; + +NSString *getDefaultFilePath(NSString *fileName) { + NSString *fullFileName = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents"]; + fullFileName = [fullFileName stringByAppendingString:fileName]; + NSLog(@"fullFileName is: %@", fullFileName); + if ([[NSFileManager defaultManager] fileExistsAtPath:fullFileName]) { + NSLog(@"fullFileName exists: %@", fullFileName); + } else{ + fullFileName = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:fileName]; + NSLog(@"fullFileName exists: %@", fullFileName); + } + return fullFileName; } + NSString *getVMOptionsFilePath() { return [getPreferencesFolderPath() stringByAppendingString:@"/idea.vmoptions"]; } @@ -237,7 +250,8 @@ NSString *getVMOptionsFilePath() { NSArray *parseVMOptions() { NSArray *inConfig=[VMOptionsReader readFile:getVMOptionsFilePath()]; if (inConfig) return inConfig; - return [VMOptionsReader readFile:getDefaultVMOptionsFilePath()]; + //return [VMOptionsReader readFile:getDefaultVMOptionsFilePath()]; + return [VMOptionsReader readFile:getDefaultFilePath(@"/bin/idea.vmoptions")]; } NSDictionary *parseProperties() {