Changeset 11577 for issm/branches/trunk-jpl-damage/src/m/utils/Shell

Timestamp:

02/29/12 13:35:30 (13 years ago)

Author:

cborstad

Message:

merged changes up to r11576 from trunk-jpl into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/m (modified) (1 prop)
• src/m/utils (modified) (1 prop)
• src/m/utils/Shell (modified) (1 prop)
• src/m/utils/Shell/Makefile.am (copied) (copied from issm/trunk-jpl/src/m/utils/Shell/Makefile.am )
• src/m/utils/Shell/issmdir.m (modified) (1 diff)
• src/m/utils/Shell/issmtier.m (modified) (1 diff)

issm/branches/trunk-jpl-damage ¶

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

issm/branches/trunk-jpl-damage/src/m/utils/Shell/issmdir.m ¶

@@ -5 +5 @@
 %      ISSM_DIR=issmdir()
 
-ISSM_DIR =getenv('ISSM_DIR');
+if ~ispc,
+        ISSM_DIR =getenv('ISSM_DIR');
+else
+        ISSM_DIR =getenv('ISSM_DIR_WIN');
+end
 
 if (isempty(ISSM_DIR)),

issm/branches/trunk-jpl-damage/src/m/utils/Shell/issmtier.m ¶

@@ -5 +5 @@
 %      ISSM_TIER=issmtier()
 
-ISSM_TIER =getenv('ISSM_TIER');
+if ~ispc, 
+        ISSM_TIER =getenv('ISSM_TIER');
+else
+        ISSM_TIER =getenv('ISSM_TIER_WIN');
+        if strcmpi(ISSM_TIER(end),'/') | strcmpi(ISSM_TIER(end),'\'),
+                ISSM_TIER = ISSM_TIER(1:end-1); %shave off the last '/'
+        end
+end
 
 if (isempty(ISSM_TIER)),

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog