From f507f0536e8d2e6f5a752968390565e3df645311 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 8 Aug 2024 01:45:52 +0200 Subject: [PATCH 1/4] check if not already there --- spcd/__main__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/__main__.py b/spcd/__main__.py index c904941..6c62422 100755 --- a/spcd/__main__.py +++ b/spcd/__main__.py @@ -2,8 +2,8 @@ """Entry point.""" -import os import sys +from os import environ, pathsep import env @@ -12,7 +12,7 @@ if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: import spcd if __name__ == "__main__": - os.environ["PATH"] = os.pathsep.join( - [env.SPCD_PYTHON_VENV_BINARIES, os.environ["PATH"]] - ) + paths = environ["PATH"].split(pathsep) + if env.SPCD_PYTHON_VENV_BINARIES not in paths: + environ["PATH"] = pathsep.join([env.SPCD_PYTHON_VENV_BINARIES, *paths]) spcd.main(__file__) From a14e9b941ba887a53498efe96b51ac24e6170566 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 8 Aug 2024 01:53:43 +0200 Subject: [PATCH 2/4] move to init --- spcd/__init__.py | 5 +++++ spcd/__main__.py | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spcd/__init__.py b/spcd/__init__.py index 4a81720..3532b60 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -3,8 +3,10 @@ __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 @@ -61,6 +63,9 @@ 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": diff --git a/spcd/__main__.py b/spcd/__main__.py index 6c62422..1c82dba 100755 --- a/spcd/__main__.py +++ b/spcd/__main__.py @@ -3,7 +3,6 @@ """Entry point.""" import sys -from os import environ, pathsep import env @@ -12,7 +11,4 @@ if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: import spcd if __name__ == "__main__": - paths = environ["PATH"].split(pathsep) - if env.SPCD_PYTHON_VENV_BINARIES not in paths: - environ["PATH"] = pathsep.join([env.SPCD_PYTHON_VENV_BINARIES, *paths]) spcd.main(__file__) From ee3c61dad3bd516e70d578af0a85cf90cd7c3ec9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 8 Aug 2024 01:58:03 +0200 Subject: [PATCH 3/4] move to main --- spcd/__main__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/__main__.py b/spcd/__main__.py index 1c82dba..7debe9b 100755 --- a/spcd/__main__.py +++ b/spcd/__main__.py @@ -6,9 +6,9 @@ import sys import env -if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: - sys.path.insert(0, env.SPCD_PYTHON_VENV_PACKAGES) -import spcd - if __name__ == "__main__": + if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: + sys.path.insert(0, env.SPCD_PYTHON_VENV_PACKAGES) + import spcd + spcd.main(__file__) From a3cf76b28a47700da4faeac4534d99dc4862a09a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 8 Aug 2024 01:58:51 +0200 Subject: [PATCH 4/4] import main --- spcd/__main__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/__main__.py b/spcd/__main__.py index 7debe9b..6aeca41 100755 --- a/spcd/__main__.py +++ b/spcd/__main__.py @@ -9,6 +9,6 @@ import env if __name__ == "__main__": if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: sys.path.insert(0, env.SPCD_PYTHON_VENV_PACKAGES) - import spcd + from spcd import main - spcd.main(__file__) + main(__file__)