smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better flatpak command options. 

This mainly add the option `--nointeractive` when installing the sdk.
This commit is contained in:
Matthieu Gautier 2022-03-10 15:43:02 +01:00
parent af3cff6aeb
commit 8b9b74d577
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/flatpak.py
View File

@ -22,7 +22,7 @@ class org_kde(Dependency):
run_command(command, self.buildEnv.build_dir, context, env=env) run_command(command, self.buildEnv.build_dir, context, env=env)
def _install_sdk(self, context): def _install_sdk(self, context):
command = "flatpak --user install -y {remote_name} {name}.Sdk//{version} {name}.Platform//{version}" command = "flatpak --user install --noninteractive --verbose -y {remote_name} {name}.Sdk//{version} {name}.Platform//{version}"
command = command.format( command = command.format(
remote_name = 'flathub', remote_name = 'flathub',
name = self.target.name, name = self.target.name,

2
kiwixbuild/flatpak_builder.py
View File

@ -223,7 +223,7 @@ class FlatpakBuilder:
def build(self): def build(self):
log = pj(self.platform.buildEnv.log_dir, 'cmd_build_flatpak.log') log = pj(self.platform.buildEnv.log_dir, 'cmd_build_flatpak.log')
context = Context('build', log, False) context = Context('build', log, False)
command = "flatpak-builder --user --ccache --force-clean --repo=repo builddir {id}.json" command = "flatpak-builder --user --ccache --force-clean --keep-build-dirs --disable-rofiles-fuse --repo=repo builddir {id}.json"
command = command.format(id = MANIFEST['app-id']) command = command.format(id = MANIFEST['app-id'])
try: try:
run_command(command, self.platform.buildEnv.build_dir, context, env=self.platform.get_env()) run_command(command, self.platform.buildEnv.build_dir, context, env=self.platform.get_env())