[cli] Fix script argv passthrough

Author: Qonfused

ocebuild_cli/__main__.py

@@ -66,7 +66,7 @@ def parse_args(self, ctx, args):
 
         # Store the script path and remaining args in the context
         ctx.params['exec_file'] = script_path
-        ctx.params['args'] = new_args
+        ctx.obj.pargs = new_args
 
         return []  # No more arguments to process
 
@@ -78,18 +78,19 @@ def parse_args(self, ctx, args):
 @click.option('-e', '--exec', 'exec_file',
   type=click.Path(exists=True, dir_okay=False),
   help='Run the specified Python file with the CLI environment.')
-@click.argument('args', nargs=-1, type=click.UNPROCESSED)
 @click.version_option(message='ocebuild-cli %(version)s', version=__version__)
 @click.pass_context
-def cli(ctx, exec_file=None, args=None):
+def cli(ctx, exec_file=None):
   """Main runner for the CLI."""
+
   if exec_file and ctx.invoked_subcommand is None:
     try:
       # Run python script in a controlled namespace (inherits pyinstaller env)
       import runpy, sys
 
-      sys.argv = [exec_file] + list(args) if args else [exec_file]
-      ctx.obj.__dict__['argv'] = list(args) if args else []
+      args = ctx.obj.pargs
+      sys.argv = [exec_file] + list(args)
+      ctx.obj.__dict__['argv'] = args
 
       runpy.run_path(exec_file, run_name="__main__", init_globals=ctx.obj.__dict__)
       return

ocebuild_cli/_lib.py

@@ -6,7 +6,7 @@
 
 from functools import wraps as functools_wraps
 
-from typing import Optional
+from typing import List, Optional
 
 import click
 
@@ -28,6 +28,7 @@ class CLIEnv:
   """Shared CLI environment."""
 
   tmpdir: Optional[str] = None
+  pargs: List[str] = []
 
   global VERBOSE, DEBUG
   def __init__(self,

scripts/amd.py

@@ -14,6 +14,9 @@
 # ]
 # ///
 
+from os import getcwd
+from pathlib import Path
+
 import click
 from ocebuild.filesystem import extract_archive
 from ocebuild.parsers.yaml import write_yaml
@@ -25,6 +28,13 @@
 
 
 @click.command()
+@click.option("-c", "--cwd",
+              type=click.Path(exists=True,
+                              file_okay=False,
+                              readable=True,
+                              writable=True,
+                              path_type=Path),
+              help="Use the specified directory as the working directory.")
 @click.option('--cpu',
               required=True,
               type=int,
@@ -36,7 +46,11 @@
               default='patch.amd.yml',
               show_default=True,
               help='Output path for the generated YAML file')
-def main(cpu, hyperv, out):
+def main(cwd, cpu, hyperv, out):
+  if not cwd: cwd = getcwd()
+  cwd = Path(cwd).resolve()
+  out = cwd / out
+
   with extract_archive(AMD_PATCH_ARCHIVE) as tmp_dir:
     plist_file = next(tmp_dir.glob('**/patches.plist'))
     amd_patches = write_yaml(read_config(plist_file), schema='annotated')