Changeset 6089

Timestamp:

09/29/10 18:32:38 (15 years ago)

Author:

Eric.Larour

Message:

forgot to define ISSM_DIR and ISSM_TIER at the same time

File:

• issm/trunk/startup.m (modified) (1 diff)

issm/trunk/startup.m

@@ -9 +9 @@
 %   Copyright Jet Propulsion Laboratory. 
 
-global ISSM_TIER 
+global ISSM_TIER  ISSM_DIR
 lastwarn(''); % clear the last warning to focus on the warnings of the ISSM path
 
 %Recover ISSM_TIER 
 if ispc,
-        [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
+        [status1,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
+        [status2,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
 else
-        [status,ISSM_TIER]=system('echo $ISSM_TIER');
+        [status1,ISSM_TIER]=system('echo $ISSM_TIER');
+        [status2,ISSM_DIR]=system('echo $ISSM_DIR');
 end
-if status~=0,
+if status1~=0,
         error('startup error message: problem when running ''echo $ISSM_TIER'' shell command');
 end
+if status2~=0,
+        error('startup error message: problem when running ''echo $ISSM_DIR'' shell command');
+end
+
 if (length(ISSM_TIER)<=1),
         error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!');
 end
+if (length(ISSM_DIR)<=1),
+        error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
+end
+
 %get rid of useless symbols in the name
+ISSM_TIER=strtrim(ISSM_TIER); 
+clear status1;
+
 ISSM_DIR=strtrim(ISSM_DIR); 
 clear status;