Merge pull request #128 from matthiasclasen/run-fixes

Some fixes for xdg-app-builder --run

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));
         }
     }

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>