rda-python-setuid 1.0.5__tar.gz → 1.0.6__tar.gz

{rda_python_setuid-1.0.5/src/rda_python_setuid.egg-info → rda_python_setuid-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.5
+Version: 1.0.6
 Summary: RDA Python Package to setuid for program executions as an effective or common user
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-setuid

{rda_python_setuid-1.0.5 → rda_python_setuid-1.0.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_setuid"
-version = "1.0.5"
+version = "1.0.6"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_setuid-1.0.5 → rda_python_setuid-1.0.6}/src/rda_python_setuid/install.py

@@ -12,16 +12,16 @@
 #
 # Usage:
 #   # 1. Compile and install pywrapper (run once per environment):
-#   pywrapper-install [-u gdexdata] [-e $ENVHOME/bin/]
+#   pywrapper-install [-u gdexdata] [-e $ENVHOME]
 #
 #   # 2. Create pgstart_USER entry so USER can run commands as themselves:
-#   pywrapper-install -p [-u zji] [-e $ENVHOME/bin/]
+#   pywrapper-install -p [-u zji] [-e $ENVHOME]
 #
 #   # 3. Create a symlink so a program runs as CommonUser via pywrapper (setuid):
-#   pywrapper-install -l myprog [-u gdexdata] [-e $ENVHOME/bin/]
+#   pywrapper-install -l myprog [-u gdexdata] [-e $ENVHOME]
 #
 #   # 4. Simple install: symlink PROGRAM -> setuid_PROGRAM (no setuid, runs as current user):
-#   pywrapper-install -l myprog -s [-e $ENVHOME/bin/]
+#   pywrapper-install -l myprog -s [-e $ENVHOME]
 #
 # Convention for wrapped programs:
 #   The target package must register its connector entry point with a setuid_ prefix:
@@ -73,7 +73,7 @@ def main():
    )
    parser.add_argument(
       '-e', '--envhome', default=None,
-      help="Path to the venv bin/ directory (default: bin/ dir of the current Python executable)"
+      help="Path to the venv root directory containing bin/ (default: parent of the current Python executable's bin/ dir)"
    )
    parser.add_argument(
       '-u', '--user', default=None,
@@ -101,7 +101,7 @@ def main():
       else:
          args.user = 'gdexdata'
 
-   bindir = args.envhome or get_bindir()
+   bindir = os.path.join(args.envhome, 'bin') if args.envhome else get_bindir()
    pywrapper = os.path.join(bindir, 'pywrapper')
 
    if args.link:

{rda_python_setuid-1.0.5 → rda_python_setuid-1.0.6}/src/rda_python_setuid/install.usg

@@ -2,7 +2,7 @@
  that execute Python scripts as a common or effective user via the setuid mechanism.
  Must be run inside the target Python virtual environment.
 
- Usage: pywrapper-install [-u USER] [-e BINDIR] [-p | -l PROGRAM [-s]]
+ Usage: pywrapper-install [-u USER] [-e ENVHOME] [-p | -l PROGRAM [-s]]
 
       - Option -u or --user USER
           The user name to own the setuid binary.  For Mode 1 (CommonUser program),
@@ -10,10 +10,11 @@
           the specialist user (e.g. zji).  Defaults to 'gdexdata' unless -p/--pgstart
           is given, in which case it defaults to the current login user.
 
-      - Option -e or --envhome BINDIR
-          Path to the venv bin/ directory.  Defaults to the bin/ directory of the
-          currently active Python executable.  Only needed when installing into an
-          environment other than the one currently active.
+      - Option -e or --envhome ENVHOME
+          Path to the venv root directory (the parent of bin/).  Defaults to the
+          parent of the currently active Python executable's bin/ directory.
+          Only needed when installing into an environment other than the one
+          currently active.
 
       - Option -p or --pgstart
           Mode 2: copy the compiled pywrapper binary to pgstart_USER (owned by USER,
@@ -120,7 +121,7 @@
          pywrapper-install
 
    2. Same, but targeting a specific environment:
-         pywrapper-install -e /glade/u/home/gdexdata/gdexmsenv/bin/
+         pywrapper-install -e /glade/u/home/gdexdata/gdexmsenv
 
    3. Wire up dsarch to run as gdexdata via pywrapper:
          pywrapper-install -l dsarch

{rda_python_setuid-1.0.5 → rda_python_setuid-1.0.6/src/rda_python_setuid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.5
+Version: 1.0.6
 Summary: RDA Python Package to setuid for program executions as an effective or common user
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-setuid