(DiamondLightSource/hyperion#1474) fixes to save_panda script

DiamondLightSource · Aug 6, 2024 · 2b778af · 2b778af
1 parent a4556b1
commit 2b778af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,7 +69,7 @@ dev = [
 
 [project.scripts]
 dodal = "dodal.__main__:main"
-save-panda = "dodal.devices.util.save_panda"
+save-panda = "dodal.devices.util.save_panda:main"
 
 [project.urls]
 GitHub = "https://github.com/DiamondLightSource/dodal"

diff --git a/src/dodal/devices/util/save_panda.py b/src/dodal/devices/util/save_panda.py
@@ -18,7 +18,7 @@ def save_to_file():
     RE(save_to_file())
 
 
-def _main():
+def main():
     parser = ArgumentParser(description="Save an ophyd_async device to yaml")
     parser.add_argument(
         "--beamline", help="beamline to save from e.g. i03. Defaults to BEAMLINE"
@@ -34,6 +34,12 @@ def _main():
 
     if beamline:
         os.environ["BEAMLINE"] = beamline
+    else:
+        beamline = os.environ["BEAMLINE"]
+
+    if not beamline:
+        print(f"BEAMLINE not set and --beamline not specified")
+        return 1
 
     RE = RunEngine()
 
@@ -51,4 +57,4 @@ def _main():
 
 
 if __name__ == "__main__":
-    sys.exit(_main())
+    sys.exit(main())