Changeset 20443

Timestamp:

04/06/16 19:54:32 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: previous method did not seem to work

File:

• issm/trunk-jpl/src/m/os/oshostname.m (modified) (2 diffs)

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

@@ -5 +5 @@
 %      hostname=oshostname();
 
-% Find computer name from environment
-if ispc
-        hostname = getenv('COMPUTERNAME');
-else
-        hostname = getenv('HOSTNAME');
+%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');
+
+% If that command did not work, we have an alternative
+if status~=0,
+        if ispc
+                hostname = getenv('COMPUTERNAME');
+        else
+                hostname = getenv('HOSTNAME');
+        end
 end
 
@@ -15 +21 @@
 hostname = strrep(hostname,'-','');
 
+% Trim and lower case
+hostname = strtrim(lower(hostname));
+
 % Check that machine name is not empty
 if isempty(hostname),