Changeset 22758 for issm/trunk/src/m/os/issmdir.m

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/os/issmdir.m (modified) (1 diff)

issm/trunk/src/m/os/issmdir.m

@@ -7 +7 @@
 %Initialize output ISSM_DIR
 ISSM_DIR='';
-slash=filesep();
 
 %Get ISSM_DIR from function path (we do not want to force users to edit their bashrc)
-path=which('issmdir');
+path = mfilename('fullpath');
 
 %issmdir might be in bin,
-pos=strfind(path,['bin' slash 'issmdir.m']);
+slash = filesep();
+pos   = strfind(path,['bin' slash 'issmdir']);
 if ~isempty(pos),
         ISSM_DIR=path(1:pos-1);
 else
-        pos=strfind(path,['src' slash 'm' slash 'os' slash 'issmdir.m']);
+        pos=strfind(path,['src' slash 'm' slash 'os' slash 'issmdir']);
         if ~isempty(pos),
                 ISSM_DIR=path(1:pos-1);