spcd/__init__.py

@@ -3,10 +3,8 @@
 __version__ = "0.0.1"
 
 import sys
-from os import environ, pathsep
 from pathlib import Path
 
-import env
 from rwx import fs
 from rwx.log import stream as log
 from rwx.ps import run
@@ -63,9 +61,6 @@ def list_environment_variables() -> None:
 
 
 def main(main: str) -> None:
-    paths = environ["PATH"].split(pathsep)
-    if env.SPCD_PYTHON_VENV_BINARIES not in paths:
-        environ["PATH"] = pathsep.join([env.SPCD_PYTHON_VENV_BINARIES, *paths])
     path, *arguments = sys.argv
     name = Path(path).name
     if name == "__main__.py":

spcd/__main__.py

@@ -2,13 +2,17 @@
 
 """Entry point."""
 
+import os
 import sys
 
 import env
 
-if __name__ == "__main__":
-    if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path:
+if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path:
     sys.path.insert(0, env.SPCD_PYTHON_VENV_PACKAGES)
-    from spcd import main
+import spcd
 
-    main(__file__)
+if __name__ == "__main__":
+    os.environ["PATH"] = os.pathsep.join(
+        [env.SPCD_PYTHON_VENV_BINARIES, os.environ["PATH"]]
+    )
+    spcd.main(__file__)