Correct order in which directories are searched.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3287 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-11-21 05:09:58 +00:00
parent c1680d9f00
commit 84d54477bf

View file

@ -130,12 +130,14 @@ main(int argc, char** argv)
/*
* Build a list of 'root' directories to search for applications.
* Order is important - later duplicates of services are ignored.
*/
str = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"];
str = [env objectForKey: @"GNUSTEP_USER_ROOT"];
if (str != nil)
[roots addObject: str];
usrRoot = str;
else
[roots addObject: @"/usr/GNUstep"];
usrRoot = [NSString stringWithFormat: @"%@/GNUstep", NSHomeDirectory()];
[roots addObject: usrRoot];
str = [env objectForKey: @"GNUSTEP_LOCAL_ROOT"];
if (str != nil)
@ -143,12 +145,11 @@ main(int argc, char** argv)
else
[roots addObject: @"/usr/GNUstep/Local"];
str = [env objectForKey: @"GNUSTEP_USER_ROOT"];
str = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"];
if (str != nil)
usrRoot = str;
[roots addObject: str];
else
usrRoot = [NSString stringWithFormat: @"%@/GNUstep", NSHomeDirectory()];
[roots addObject: usrRoot];
[roots addObject: @"/usr/GNUstep"];
/*
* List of directory names to search within each root directory