Parse output of zprocess.makesecret better

chrisjbillington · chrisjbillington · commit 2735750165f4 · 2020-05-27T21:03:41.000-04:00
Apparently on Windows it ends in a blank line and on Unix it doesn't, so
we need to look for the line we want instead of assuming it's the last
one.
diff --git a/labscript_profile/create.py b/labscript_profile/create.py
@@ -14,8 +14,11 @@ def make_shared_secret(directory):
     """Create a new zprocess shared secret file in the given directory and return its
     filepath"""
     cmd = [sys.executable, '-m', 'zprocess.makesecret']
-    path = check_output(cmd, cwd=directory).decode('utf8').splitlines()[-1].strip()
-    return Path(path)
+    output = check_output(cmd, cwd=directory).decode('utf8')
+    for line in output.splitlines():
+        if 'zpsecret' in line and '.key' in line:
+            return Path(line.strip())
+    raise RuntimeError("Could not parse output of zprocess.makesecret")
 
 
 def make_labconfig_file():
