Changeset 25196 for issm/trunk-jpl/src/m/coordsystems/gmtmask.m

Timestamp:

07/02/20 10:53:58 (5 years ago)

Author:

jdquinn

Message:

CHG: Fixes for Linux solid earth binaries; applied similar changes to other packaging/testing scripts; clean up

File:

• issm/trunk-jpl/src/m/coordsystems/gmtmask.m (modified) (3 diffs)

issm/trunk-jpl/src/m/coordsystems/gmtmask.m

@@ -36 +36 @@
 
         %Avoid bypassing of the ld library path by Matlab (:()
+        %
+        % TODO: Do we really need this (we can/already set it in etc/environment.sh)?
         if ismac,
                 dyld_library_path_old=getenv('DYLD_LIBRARY_PATH');
@@ -42 +44 @@
 
         %Find path to gmt, list all possible known paths to gmt (you may need to add yours to the list)
-   paths = {[issmdir() '/bin/gmt'],[issmdir() '/externalpackages/gmt/install/bin/gmt'],'/Applications/GMT-5.4.3.app/Contents/Resources/bin/gmt'};
+   gmtpaths = {[issmdir '/bin/gmt'],[issmdir '/externalpackages/gmt/install/bin/gmt'],'/Applications/GMT-5.4.3.app/Contents/Resources/bin/gmt'};
    gmtpath = '';
-   for i=paths
+   for i=gmtpaths
       if exist(i{1},'file'),
          gmtpath = i{1};
@@ -51 +53 @@
    end
    if isempty(gmtpath),
-      error('gmt not found, make sure it is properly installed, or add its path to this file (line 44)');
+      error('gmt not found! Make sure it is properly installed, or add its path to this file.');
    end