=================================================================== RCS file: /home/cvs/OpenXM/src/cfep/MyEnvironment.m,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM/src/cfep/MyEnvironment.m 2006/03/06 08:55:31 1.2 +++ OpenXM/src/cfep/MyEnvironment.m 2018/10/18 06:29:42 1.7 @@ -135,7 +135,7 @@ if ([s compare: @"PATH"] == NSOrderedSame) { char *path; NSString *defaultPath; - defaultPath=@"/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/sw/bin:/sw/sbin:/usr/local/bin"; + defaultPath=@"/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/TeX/texbin:/opt/local/bin:/opt/local/sbin:/opt/bin:/opt/sbin:/usr/local/bin"; path = getenv("PATH"); if (!path) { s = [NSString stringWithCString: path length: strlen(path)]; @@ -170,16 +170,17 @@ [super dealloc]; } +(int) checkX { + /* still use an deprecated functions */ NSEnumerator *apps = [[[NSWorkspace sharedWorkspace] launchedApplications] objectEnumerator ]; NSDictionary *dicApp; while (dicApp = [apps nextObject]) { - if ([@"X11" compare: [dicApp objectForKey: @"NSApplicationName"]] == NSOrderedSame) { + if ([@"XQuartz" compare: [dicApp objectForKey: @"NSApplicationName"]] == NSOrderedSame) { NSLog(@"X11 is running.\n"); return 1; } } NSLog(@"X11 is NOT running.\n"); - return 0; + return 0; } -(void) showForDebug { NSLog(@"OpenXM_HOME=%@\n",OpenXM_HOME); @@ -215,6 +216,17 @@ -(NSDictionary *)getMyDefaultTypingAttributes { return myDefaultTypingAttributes; } ++(int) isX11Installed { + NSFileManager *manager = [NSFileManager defaultManager]; + if ([manager fileExistsAtPath: @"/opt/X11/bin/X"]) return 1; + else return 0; +} ++(int) isGccInstalled { + NSFileManager *manager = [NSFileManager defaultManager]; + if ([manager fileExistsAtPath: @"/usr/bin/gcc"]) return 1; + else return 0; +} + @end