Fix bug. Show progress in scp'ing

bmarcote · Dec 19, 2022 · 342707f · 342707f
1 parent bb25a83
commit 342707f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/evn_postprocess/environment.py b/evn_postprocess/environment.py
@@ -12,7 +12,7 @@ def scp(originpath, destpath):
     """
     print("\n\033[1m> " + f"scp {originpath} {destpath}" + "\033[0m")
     process = subprocess.call(["scp", originpath, destpath], shell=False,
-                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                              stdout=None, stderr=subprocess.PIPE)
     if process != 0:
         raise ValueError(f"\nError code {process} when running scp {originpath} {destpath} in ccs.")
 

diff --git a/evn_postprocess/experiment.py b/evn_postprocess/experiment.py
@@ -990,9 +990,9 @@ def keyfile(self):
         keyfilepath = self.cwd / f"{self.expname.lower()}.key"
         if not keyfilepath.exists():
             env.scp(f"[email protected]:vlbi_arch/" \
-               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}" + r"\*" + ".key", ".")
+               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}.key", ".")
             self.log(f"scp [email protected]:vlbi_arch/" \
-               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}" + r"\*" + ".key .")
+               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}.key .")
 
         return keyfilepath
 
@@ -1004,9 +1004,9 @@ def sumfile(self):
         keyfilepath = self.cwd / f"{self.expname.lower()}.sum"
         if not keyfilepath.exists():
             env.scp(f"[email protected]:vlbi_arch/" \
-               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}" + r"\*" + ".sum", ".")
+               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}.sum", ".")
             self.log(f"scp [email protected]:vlbi_arch/" \
-               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}" + r"\*" + ".sum .")
+               f"{self.obsdatetime.strftime('%b%y').lower()}/{self.expname.lower()}.sum .")
 
         return keyfilepath