update run.py to latest from https://gitlab.com/saltstack/open/salt-pkg/-/raw/master/pkgs/redhat/sources/run.py

run.py

@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-
 #!/usr/bin/env python3
-
-# Import python libs
+# see issue: https://gitlab.com/saltstack/open/salt-pkg/-/issues/19
+import _pyio
+import contextlib
 import multiprocessing
 import os
-import site
+import pathlib
 import sys
 
-# Import third party libs
-from pip._internal.cli.main import main
-
-# Import salt libs
 import salt.scripts
 import salt.utils.platform
+import tiamatpip.cli
+import tiamatpip.configure
+import tiamatpip.utils
 
 AVAIL = (
     "minion",
@@ -34,40 +33,40 @@ AVAIL = (
 )
 
 
-PIP_PATH = os.path.join("opt", "saltstack", "salt", "pypath")
-if not os.path.exists(PIP_PATH):
-    os.makedirs(PIP_PATH, mode=0o755)
-
-site.ENABLE_USER_SITE = True
-site.USER_BASE = PIP_PATH
+PIP_PATH = pathlib.Path(f"{os.sep}opt", "saltstack", "salt", "pypath")
+with contextlib.suppress(PermissionError):
+    PIP_PATH.mkdir(mode=0o755, parents=True, exist_ok=True)
+tiamatpip.configure.set_user_site_packages_path(PIP_PATH)
 
 
-def redirect():
+def redirect(argv):
     """
     Change the args and redirect to another salt script
     """
-    if len(sys.argv) < 2:
+    if len(argv) < 2:
         msg = "Must pass in a salt command, available commands are:"
         for cmd in AVAIL:
-            msg += "\n{0}".format(cmd)
-        print(msg)
+            msg += f"\n{cmd}"
+        print(msg, stream=sys.stderr, flush=True)
         sys.exit(1)
     cmd = sys.argv[1]
     if cmd == "shell":
         py_shell()
         return
-    elif cmd == "pip":
-        pip()
+    if tiamatpip.cli.should_redirect_argv(argv):
+        tiamatpip.cli.process_pip_argv(argv)
         return
-    elif cmd not in AVAIL:
+    if cmd not in AVAIL:
         # Fall back to the salt command
-        sys.argv[0] = "salt"
+        args = ["salt"]
         s_fun = salt.scripts.salt_main
     else:
-        sys.argv[0] = "salt-{0}".format(cmd)
+        args = [f"salt-{cmd}"]
         sys.argv.pop(1)
-        s_fun = getattr(salt.scripts, "salt_{0}".format(cmd))
-    s_fun()
+        s_fun = getattr(salt.scripts, f"salt_{cmd}")
+    args.extend(argv[1:])
+    with tiamatpip.utils.patched_sys_argv(args):
+        s_fun()
 
 
 def py_shell():
@@ -80,51 +79,7 @@ def py_shell():
     shell.interact()
 
 
-def pip():
-    targets = (
-        "install",
-        "list",
-        "freeze",
-        "uninstall",
-    )
-    try:
-        cmd = sys.argv[2]
-    except IndexError:
-        msg = "Must pass in available pip command which are:"
-        for cmd in targets:
-            msg += "\n{0}".format(cmd)
-        print(msg)
-        sys.exit(1)
-
-    # Valid command found
-    if cmd == "install" and cmd in targets:
-        args = [cmd, "--target", PIP_PATH]
-        _change_perms(PIP_PATH, 0o777)
-    elif cmd == "uninstall" and cmd in targets:
-        print("pip uninstall is a feature in progress")
-        sys.exit(1)
-    elif cmd == "list" or "freeze" and cmd in targets:
-        args = [cmd, "--path", PIP_PATH]
-    else:
-        args = [cmd]
-    args.extend(sys.argv[3:])
-    parser = ["pip"] + args
-    sys.argv = parser
-    main(args)
-
-    # When main return, return original mode to restrict access
-    _change_perms(PIP_PATH, 0o755)
-
-
-def _change_perms(path, mode):
-    for root, dirs, files in os.walk(path, topdown=False):
-        for dir in [os.path.join(root, d) for d in dirs]:
-            os.chmod(dir, mode)
-        for file in [os.path.join(root, f) for f in files]:
-            os.chmod(file, mode)
-
-
 if __name__ == "__main__":
     if sys.platform.startswith("win"):
         multiprocessing.freeze_support()
-    redirect()
+    redirect(sys.argv)