diff options
| author | Alexander Larsson <alexander.larsson@gmail.com> | 2016-04-15 11:50:34 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2016-04-15 11:50:34 +0200 |
| commit | 265ba5e528e63a99d887ea8b1947446a74f52598 (patch) | |
| tree | 32050509c0e51cb08f783e0f48a8dfc68b457fd7 | |
| parent | 1ee0fb7e96fb2b04aa8a03d8edc66d27208a59d9 (diff) | |
| parent | ae96c039f9a3f675e999fd8408caf7e5b5188d83 (diff) | |
| download | xdg-app-265ba5e528e63a99d887ea8b1947446a74f52598.tar.gz | |
Merge pull request #128 from matthiasclasen/run-fixes
Some fixes for xdg-app-builder --run
| -rw-r--r-- | builder/builder-manifest.c | 8 | ||||
| -rw-r--r-- | doc/xdg-app-builder.xml | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index b89e5b6..26f6f33 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -1980,14 +1980,16 @@ builder_manifest_run (BuilderManifest *self, g_ptr_array_add (args, g_strdup_printf ("--env=%s", env[i])); } - /* Inherit all finish args except the filesystem ones so the - * command gets the same access as the final app */ + /* Inherit all finish args except the filesystem and command + * ones so the command gets the same access as the final app + */ if (self->finish_args) { for (i = 0; self->finish_args[i] != NULL; i++) { const char *arg = self->finish_args[i]; - if (!g_str_has_prefix (arg, "--filesystem")) + if (!g_str_has_prefix (arg, "--filesystem") && + !g_str_has_prefix (arg, "--command")) g_ptr_array_add (args, g_strdup (arg)); } } diff --git a/doc/xdg-app-builder.xml b/doc/xdg-app-builder.xml index 29af375..bf00e0d 100644 --- a/doc/xdg-app-builder.xml +++ b/doc/xdg-app-builder.xml @@ -35,6 +35,14 @@ <arg choice="plain">DIRECTORY</arg> <arg choice="plain">MANIFEST</arg> </cmdsynopsis> + <cmdsynopsis> + <command>xdg-app-builder</command> + <arg choice="plain">--run</arg> + <arg choice="opt" rep="repeat">OPTION</arg> + <arg choice="plain">DIRECTORY</arg> + <arg choice="plain">MANIFEST</arg> + <arg choice="plain">COMMAND</arg> + </cmdsynopsis> </refsynopsisdiv> <refsect1> @@ -574,7 +582,8 @@ <listitem><para> Run a command in a sandbox based on the build dir. This starts xdg-app build, with some extra arguments to give the same environment as the build, and the same permissions the final app - will have. + will have. The command to run must be the last argument passed to + xdg-app-builder, after the directory and the manifest. </para></listitem> </varlistentry> |