From 68bbc14b0c0f6bc1ccc306de412037de93a48d41 Mon Sep 17 00:00:00 2001 From: cabiste Date: Thu, 19 Oct 2023 20:08:28 +0000 Subject: [PATCH] use '--appdir' argument when generating a recipe (if used) --- appimagebuilder/__main__.py | 2 +- appimagebuilder/modules/generate/command_generate.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/appimagebuilder/__main__.py b/appimagebuilder/__main__.py index f562dbc1..48cc8390 100755 --- a/appimagebuilder/__main__.py +++ b/appimagebuilder/__main__.py @@ -32,7 +32,7 @@ def __main__(): exit(0) if args.generate: - generator = CommandGenerate() + generator = CommandGenerate(args.appdir) generator.generate() exit(0) diff --git a/appimagebuilder/modules/generate/command_generate.py b/appimagebuilder/modules/generate/command_generate.py index eaa18b71..cc731870 100644 --- a/appimagebuilder/modules/generate/command_generate.py +++ b/appimagebuilder/modules/generate/command_generate.py @@ -36,11 +36,11 @@ class GenerateMethodError(RuntimeError): class CommandGenerate: - def __init__(self): + def __init__(self, app_dir): self.logger = logging.getLogger("Generator") self.logger.info("Searching AppDir") - self.app_dir = self._locate_app_dir() + self.app_dir = self._locate_app_dir(app_dir) # configure Recipe Generator package_manager_section_generators = [] @@ -88,7 +88,10 @@ def _write_recipe_file(self, recipe): yaml.dump(recipe, f) @staticmethod - def _locate_app_dir(): + def _locate_app_dir(given_appdir): + if os.path.isdir(given_appdir): + return pathlib.Path(given_appdir).absolute() + for file_name in os.listdir(os.path.curdir): if os.path.isdir(file_name) and file_name.lower() == "appdir": return pathlib.Path(file_name).absolute()