2025-01-10T15:36:21Z

wrmsr · Jan 10, 2025 · 1f98492 · 1f98492
1 parent ef7e3b3
commit 1f98492
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/om b/om
@@ -1,4 +1,8 @@
 #!/bin/sh
 set -e
 
-exec ./python -m omdev.cli "$@"
+SCRIPT_PATH=$(cd -- "$(dirname -- "$0")" && pwd)
+SCRIPT_PATH="$SCRIPT_PATH/$(basename -- "$0")"
+SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
+
+exec "$SCRIPT_DIR/python" -m omdev.cli --cli-pkg-root "$SCRIPT_DIR" "$@"
diff --git a/omdev/pyproject/resources/python.sh b/omdev/pyproject/resources/python.sh
@@ -9,7 +9,10 @@ if [ -z "${VENV}" ] ; then
     fi
 fi
 
-SCRIPT_DIR=$(dirname "$0")
+SCRIPT_PATH=$(cd -- "$(dirname -- "$0")" && pwd)
+SCRIPT_PATH="$SCRIPT_PATH/$(basename -- "$0")"
+SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
+
 VENV_PYTHON_PATH="$SCRIPT_DIR/.venvs/$VENV/bin/python"
 if [ -f "$VENV_PYTHON_PATH" ] ; then
     PYTHON="$VENV_PYTHON_PATH"
@@ -19,7 +22,7 @@ else
     PYTHON=python
 fi
 
-export PYTHONPATH="$PYTHONPATH:."
+export PYTHONPATH="$PYTHONPATH:$SCRIPT_DIR:."
 
 if [ $# -eq 0 ] && "$PYTHON" -c "import IPython" 2> /dev/null ; then
     exec "$PYTHON" -m IPython

diff --git a/omdev/tools/cc.py b/omdev/tools/cc.py
@@ -68,6 +68,12 @@ def run(self) -> int:
 
         return proc.returncode
 
+    @ap.cmd(
+        ap.arg('src-file', nargs='+'),
+    )
+    def add_shebang(self) -> None:
+        print(self.args.src_file)
+
 
 def _main() -> None:
     Cli().cli_run_and_exit()

diff --git a/ominfra/pyremote.py b/ominfra/pyremote.py
@@ -381,6 +381,7 @@ def __init__(
         self._payload_z = zlib.compress(self._prepared_payload_src.encode('utf-8'))
 
         self._options_json = json.dumps(dc.asdict(options), indent=None, separators=(',', ':')).encode('utf-8')  # noqa
+
     #
 
     @classmethod

diff --git a/python b/python
@@ -9,7 +9,11 @@ if [ -z "${VENV}" ] ; then
     fi
 fi
 
-SCRIPT_DIR=$(dirname "$0")
+SCRIPT_PATH=$(cd -- "$(dirname -- "$0")" && pwd)
+SCRIPT_PATH="$SCRIPT_PATH/$(basename -- "$0")"
+SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
+echo "SCRIPT_DIR=$SCRIPT_DIR"
+
 VENV_PYTHON_PATH="$SCRIPT_DIR/.venvs/$VENV/bin/python"
 if [ -f "$VENV_PYTHON_PATH" ] ; then
     PYTHON="$VENV_PYTHON_PATH"
@@ -19,7 +23,7 @@ else
     PYTHON=python
 fi
 
-export PYTHONPATH="$PYTHONPATH:."
+export PYTHONPATH="$PYTHONPATH:$SCRIPT_DIR:."
 
 if [ $# -eq 0 ] && "$PYTHON" -c "import IPython" 2> /dev/null ; then
     exec "$PYTHON" -m IPython
-Original file line number
+Diff line change
@@ Expand Up / @@ -381,6 +381,7 @@ def __init__( @@
             self._payload_z = zlib.compress(self._prepared_payload_src.encode('utf-8'))
             self._options_json = json.dumps(dc.asdict(options), indent=None, separators=(',', ':')).encode('utf-8')  # noqa
         #
         @classmethod
@@ Expand Down @@