Changeset 6611

Timestamp:

11/17/10 14:15:57 (14 years ago)

Author:

Mathieu Morlighem

Message:

simpler startup.m using getenv matlab built-in function

File:

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

issm/trunk/startup.m

@@ -13 +13 @@
 
 %Recover ISSM_TIER, ISSM_DIR and USERNAME
-if ispc,
-        [status1,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
-        [status2,ISSM_DIR] =system('echo [%ISSM_DIR_WIN%]');
-        [status3,USERNAME] =system('echo [%USER%]');
-else
-        [status1,ISSM_TIER]=system('echo $ISSM_TIER');
-        [status2,ISSM_DIR] =system('echo $ISSM_DIR');
-        [status3,USERNAME] =system('echo $USER');
-end
-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 status3~=0, error('startup error message: problem when running ''echo $USER'' shell command'); end
-clear status1 status2 status3;
-if (length(ISSM_TIER)<=1),
+ISSM_TIER=getenv('ISSM_TIER');
+ISSM_DIR =getenv('ISSM_DIR');
+USERNAME =getenv('USER');
+if (isempty(ISSM_TIER)),
         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),
+if (isempty(ISSM_DIR)),
         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); 
-ISSM_DIR =strtrim(ISSM_DIR); 
-USERNAME =strtrim(USERNAME);
 
 %Now add all issm code paths necessary to run issm smoothly.