Changeset 20442 for issm/trunk-jpl/src/m/os/oshostname.m

Timestamp:

04/06/16 19:41:55 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplified oshostname

File:

• issm/trunk-jpl/src/m/os/oshostname.m (modified) (1 diff)

issm/trunk-jpl/src/m/os/oshostname.m

@@ -1 +1 @@
 function hostname=oshostname()
-%OSHOSTNAME figure out hostname, irrespective of os type
+%OSHOSTNAME - Determine hostname, irrespective of os type
 %
-%   usage: hostname=oshostname();
-%
-%
+%   Usage:
+%      hostname=oshostname();
 
-if ispc(),
-        [status,hostname]=system('hostname');
-        if status, 
-                error('oshostname error message: could not run hostname command on windows os');
-        end
+% Find computer name from environment
+if ispc
+        hostname = getenv('COMPUTERNAME');
 else
-        %See http://www.mathworks.com/help/matlab/ref/system.html "tips" section
-        %We need to add < /dev/null otherwise what is in the clipboard is added
-        [status,hostname]=system('hostname < /dev/null');
-        hostname = strrep(hostname,'-','');
-        if status, 
-                error('oshostname error message: could not run hostname command on *nix os');
-        end
+        hostname = getenv('HOSTNAME');
 end
 
-%remove carriage return and blank spaces
-hostname=hostname(1:end-1);
-hostname=ddewhite(hostname);
+% Take out minus signs
+hostname = strrep(hostname,'-','');
+
+% Check that machine name is not empty
+if isempty(hostname),
+        error('Cannot determine machine name');
+end