janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-25 09:35:54 +02:00
Code Activity Actions

pkg.App: Add options --distro-id, --interactive

Browse source 
Add the global options --distro-id and --interactive, and expose them
as properties App.distro_id and App.interactive, respectively.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-03-06 09:33:25 +01:00
commit f24541dbe4
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/python/jw/pkg/App.py
View file

@ -211,6 +211,7 @@ class App(Base):
# -- Members without default values # -- Members without default values
self.__opt_os: str|None = None self.__opt_os: str|None = None
self.__opt_interactive: bool|None = None
self.__top_name: str|None = None self.__top_name: str|None = None
self.__os_release: str|None = None self.__os_release: str|None = None
self.__distro_id: str|None = None self.__distro_id: str|None = None
@ -220,6 +221,7 @@ class App(Base):
self.__res_cache = ResultCache() self.__res_cache = ResultCache()
self.__topdir: str|None = None self.__topdir: str|None = None
self.__pretty_topdir: str|None = None self.__pretty_topdir: str|None = None
self.__exec_context: ExecContext|None = None
# -- Members with default values # -- Members with default values
self.__topdir_fmt = 'absolute' self.__topdir_fmt = 'absolute'
@ -234,6 +236,8 @@ class App(Base):
parser.add_argument('-p', '--prefix', default = None, parser.add_argument('-p', '--prefix', default = None,
help='Parent directory of project source directories') help='Parent directory of project source directories')
parser.add_argument('-O', '--os', default = None, help='Target operating system') parser.add_argument('-O', '--os', default = None, help='Target operating system')
parser.add_argument('--distro-id', default=None, help='Distribution ID (default is taken from /etc/os-release)')
parser.add_argument('--interactive', choices=['true', 'false', 'auto'], default='true', help="Wait for user input or try to proceed unattended")
async def _run(self, args: argparse.Namespace) -> None: async def _run(self, args: argparse.Namespace) -> None:
self.__opt_os = args.os self.__opt_os = args.os
@ -249,6 +253,18 @@ class App(Base):
self.__pretty_projs_root = args.prefix self.__pretty_projs_root = args.prefix
return await super()._run(args) return await super()._run(args)
@property
def interactive(self) -> bool:
if self.__opt_interactive is None:
match self.args.interactive:
case 'true':
self.__opt_interactive = True
case 'false':
self.__opt_interactive = False
case 'auto':
self.__opt_interactive = sys.stdin.isatty()
return self.__opt_interactive
@property @property
def top_name(self): def top_name(self):
return self.__top_name return self.__top_name
@ -282,14 +298,16 @@ class App(Base):
@property @property
def distro_id(self) -> str: def distro_id(self) -> str:
if self.__distro_id is None: if self.__distro_id is None:
val = self.os_release_field('ID', throw=True) ret = self.args.distro_id # The distribution ID requested by the command line
match val: if ret is None:
case 'opensuse-tumbleweed': # The ID of the distribution we run on
self.__distro_id = 'suse' ret = self.os_release_field('ID', throw=True)
case 'kali': match ret:
self.__distro_id = 'kali' case 'opensuse-tumbleweed':
case _: ret = 'suse'
self.__distro_id = val case 'kali':
ret = 'kali'
self.__distro_id = ret
return self.__distro_id return self.__distro_id
@property @property