steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: fix OS X issue with using symlinks from outside $factor.

db4
John Benediktsson 2014-12-03 19:19:52 -08:00
parent 1e1646a691
commit 4837ceebb4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vm/os-macosx.mm
View File

@ -29,7 +29,8 @@ const char* vm_executable_path(void) {
const char* default_image_path(void) { const char* default_image_path(void) {
NSBundle* bundle = [NSBundle mainBundle]; NSBundle* bundle = [NSBundle mainBundle];
NSString* path = [bundle bundlePath]; NSString* path = [bundle bundlePath];
NSString* executable = [[bundle executablePath] lastPathComponent]; NSString* executablePath = [[bundle executablePath] stringByResolvingSymlinksInPath];
NSString* executable = [executablePath lastPathComponent];
NSString* image = [executable stringByAppendingString:@".image"]; NSString* image = [executable stringByAppendingString:@".image"];
NSString* returnVal; NSString* returnVal;
@ -45,8 +46,16 @@ const char* default_image_path(void) {
returnVal = ([mgr fileExistsAtPath:imageInBundle] ? imageInBundle returnVal = ([mgr fileExistsAtPath:imageInBundle] ? imageInBundle
: imageAlongBundle); : imageAlongBundle);
} else } else if ([executablePath hasSuffix:@".app/Contents/MacOS/factor"]) {
returnVal = executablePath;
returnVal = [returnVal stringByDeletingLastPathComponent];
returnVal = [returnVal stringByDeletingLastPathComponent];
returnVal = [returnVal stringByDeletingLastPathComponent];
returnVal = [returnVal stringByDeletingLastPathComponent];
returnVal = [returnVal stringByAppendingPathComponent:image];
} else {
returnVal = [path stringByAppendingPathComponent:image]; returnVal = [path stringByAppendingPathComponent:image];
}
return [returnVal UTF8String]; return [returnVal UTF8String];
} }