Changeset 26744 for issm/trunk/src/m/os

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/os/ismingw.m (copied) (copied from issm/trunk-jpl/src/m/os/ismingw.m )
• src/m/os/issmscpin.m (modified) (1 diff)
• src/m/os/issmscpin.py (modified) (2 diffs)
• src/m/os/issmscpout.m (modified) (3 diffs)
• src/m/os/issmscpout.py (modified) (2 diffs)
• src/m/os/issmssh.m (modified) (1 diff)
• src/m/os/issmssh.py (modified) (1 diff)
• src/m/os/oshostname.m (modified) (1 diff)

issm/trunk/src/m/os/issmscpin.m

@@ -18 +18 @@
 %if hostname and host are the same, do a simple copy
 if strcmpi(hostname,host),
-
-    for i=1:numel(packages),
+        for i=1:numel(packages),
                 success=copyfile([path '/' packages{i}]); %keep going, even if success=0
         end
-
 else
-
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project pscp.exe: it should be in the path.
 

issm/trunk/src/m/os/issmscpin.py

@@ -1 @@
-from socket import gethostname
-import subprocess
 import os
 import shutil
-import MatlabFuncs as m
+import subprocess
+from MatlabFuncs import *
 
 
 def issmscpin(host, login, port, path, packages):
-    """
-    ISSMSCPIN get packages from host, using scp on unix, and pscp on windows
-       usage: issmscpin(host, packages, path)
+    """ISSMSCPIN get packages from host, using scp on unix, and pscp on windows
+
+    Usage:
+        issmscpin(host, packages, path)
     """
 
     #first get hostname
-    hostname = gethostname()
+    hostname = oshostname()
     #first be sure packages are not in the current directory, this could conflict with pscp on windows.
     #remove warnings in case the files do not exist
@@ -29 +29 @@
                 pass
     else:
-        if m.ispc():
+        if ispc():
             #use the putty project pscp.exe: it should be in the path.
             #get ISSM_DIR variable

issm/trunk/src/m/os/issmscpout.m

@@ -9 +9 @@
 hostname=oshostname();
 
-%are we dis-allowing symbolic links? 
+%are we disallowing symbolic links? 
 if nargin==6,
         no_symlinks=1;
@@ -24 +24 @@
                 system(['rm -rf ' packages{i} ]);
                 if no_symlinks,
-                        system(['cp  ' here '/' packages{i} ' .']);
+                        system(['cp ' here '/' packages{i} ' .']);
                 else
                         system(['ln -s ' here '/' packages{i} ' .']);
@@ -31 +31 @@
         end
 else 
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project pscp.exe: it should be in the path.
 

issm/trunk/src/m/os/issmscpout.py

@@ +1 @@
+import os
 from socket import gethostname
 import subprocess
-import os
-import MatlabFuncs as m
+from MatlabFuncs import *
 
 
 def issmscpout(host, path, login, port, packages):
-    """
-    ISSMSCPOUT send packages to a host, using scp on unix, and pscp on windows
+    """ISSMSCPOUT send packages to a host, using scp on unix, and pscp on windows
 
-       usage: issmscpout(host, path, packages)
+    Usage:
+        issmscpout(host, path, packages)
     """
 
     #get hostname
-    hostname = gethostname()
+    hostname = oshostname()
 
     #if hostname and host are the same, do a simple copy
@@ -28 +28 @@
             os.chdir(here)
     else:
-        if m.ispc():
+        if ispc():
             #use the putty project pscp.exe: it should be in the path.
             #get ISSM_DIR variable

issm/trunk/src/m/os/issmssh.m

@@ -12 +12 @@
         system(command);
 else
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project plink.exe: it should be in the path.
 

issm/trunk/src/m/os/issmssh.py

@@ -1 @@
-from socket import gethostname
+import os
+import subprocess
 from sys import platform as _platform
-import subprocess
-import os
-import MatlabFuncs as m
+from MatlabFuncs import *
 
 
 def issmssh(host, login, port, command):
-    """
-    ISSMSSH - wrapper for OS independent ssh command.
+    """ISSMSSH - wrapper for OS independent ssh command.
 
-       usage:
-          issmssh(host, command)
+    Usage:
+        issmssh(host, command)
     """
 
     #first get hostname
-    hostname = gethostname()
+    hostname = oshostname()
 
     #if same as host, just run the command.
-    if m.strcmpi(host, hostname):
+    if strcmpi(host, hostname):
         subprocess.call(command, shell=True)
     else:
-        if m.ispc():
+        if ispc():
             #use the putty project plink.exe: it should be in the path.
             #get ISSM_DIR variable

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

@@ -22 +22 @@
 %Method 3, last chance
 if isempty(hostname),
-        if ispc
+        if ispc % If OS is MinGW, $COMPUTERNAME and $HOSTNAME are identical
                 hostname = getenv('COMPUTERNAME');
         else