marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename everything but the on-disk location to flatpak

tingping/wmclass
Alexander Larsson 2016-05-09 11:07:53 +02:00
parent ba37b22d78
commit 8abbc0186e
93 changed files with 676 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.gitignore vendored
View File

@ -27,33 +27,33 @@ stamp-h1
config.h.in config.h.in
stamp-* stamp-*
gtk-doc.make gtk-doc.make
xdg-app flatpak
xdg-app-session-helper flatpak-session-helper
xdg-document-portal xdg-document-portal
xdg-app-builder flatpak-builder
testdb testdb
doc/*.1 doc/*.1
*~ *~
profile/xdg-app.sh profile/flatpak.sh
xdg-app-dbus.[ch] flatpak-dbus.[ch]
xdg-app-systemd-dbus.[ch] flatpak-systemd-dbus.[ch]
xdg-app-resources.[ch] flatpak-resources.[ch]
xdg-dbus-proxy flatpak-dbus-proxy
xdg-app-system-helper flatpak-system-helper
xdg-desktop-portal xdg-desktop-portal
*.service *.service
xdg-app.env flatpak.env
xdg-app.sh flatpak.sh
document-portal/xdp-dbus.[ch] document-portal/xdp-dbus.[ch]
document-portal/xdp-resources.[ch] document-portal/xdp-resources.[ch]
.dirstamp .dirstamp
test-suite*.log test-suite*.log
lib/xdg-app-version-macros.h lib/flatpak-version-macros.h
xdg-app.pc flatpak.pc
lib/xdg-app-enum-types.c lib/flatpak-enum-types.c
lib/xdg-app-enum-types.h lib/flatpak-enum-types.h
test-libflatpak test-libflatpak
XdgApp-1.0.* Flatpak-1.0.*
/doc/reference/gtkdoc-check.log /doc/reference/gtkdoc-check.log
/doc/reference/gtkdoc-check.test /doc/reference/gtkdoc-check.test
/doc/reference/gtkdoc-check.trs /doc/reference/gtkdoc-check.trs
@ -65,8 +65,8 @@ XdgApp-1.0.*
/tests/test-keyring/.gpg-v21-migrated /tests/test-keyring/.gpg-v21-migrated
/tests/test-keyring/private-keys-v1.d/ /tests/test-keyring/private-keys-v1.d/
/tests/test-keyring/trustdb.gpg /tests/test-keyring/trustdb.gpg
/tests/hello*.xdgapp /tests/hello*.pak
/tests/platform*.xdgapp /tests/platform*.pak
/tests/repo /tests/repo
/tests/package_version.txt /tests/package_version.txt
*.test *.test
@ -76,5 +76,5 @@ XdgApp-1.0.*
po/.intltool-merge-cache po/.intltool-merge-cache
po/Makefile.in.in po/Makefile.in.in
po/POTFILES po/POTFILES
system-helper/org.freedesktop.XdgApp.policy system-helper/org.freedesktop.Flatpak.policy
bwrap bwrap

26
Makefile.am
View File

@ -31,17 +31,17 @@ CLEANFILES += $(dbus_service_DATA)
CLEANFILES += $(systemduserunit_DATA) CLEANFILES += $(systemduserunit_DATA)
EXTRA_DIST += $(service_in_files) EXTRA_DIST += $(service_in_files)
XDG_APP_BINDIR=$(bindir) FLATPAK_BINDIR=$(bindir)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DFLATPAK_BINDIR=\"$(XDG_APP_BINDIR)\" \ -DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \
-DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/xdg-app\"\ -DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/xdg-app\"\
-DFLATPAK_CONFIGDIR=\"$(sysconfdir)/xdg-app\"\ -DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\"\
-DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \ -DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \
-DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \ -DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \
-DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \ -DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \
-DHELPER=\"$(libdir)/flatpak/bwrap\" \ -DHELPER=\"$(libdir)/flatpak/bwrap\" \
-DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\" \ -DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\" \
-DG_LOG_DOMAIN=\"flatpak\" \ -DG_LOG_DOMAIN=\"flatpak\" \
-I$(srcdir)/libglnx \ -I$(srcdir)/libglnx \
-I$(srcdir)/common \ -I$(srcdir)/common \
@ -94,26 +94,26 @@ endif
endif endif
completiondir = $(datadir)/bash-completion/completions completiondir = $(datadir)/bash-completion/completions
completion_DATA = completion/xdg-app completion_DATA = completion/flatpak
EXTRA_DIST += $(completion_DATA) EXTRA_DIST += $(completion_DATA)
profiledir = $(sysconfdir)/profile.d profiledir = $(sysconfdir)/profile.d
profile_DATA = xdg-app.sh profile_DATA = flatpak.sh
EXTRA_DIST += \ EXTRA_DIST += \
profile/xdg-app.sh.in \ profile/flatpak.sh.in \
$(NULL) $(NULL)
DISTCLEANFILES += xdg-app.sh DISTCLEANFILES += flatpak.sh
xdg-app.sh: profile/xdg-app.sh.in flatpak.sh: profile/flatpak.sh.in
$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \ $(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
envdir = $(datadir)/gdm/env.d envdir = $(datadir)/gdm/env.d
env_DATA = xdg-app.env env_DATA = flatpak.env
EXTRA_DIST += env.d/xdg-app.env.in EXTRA_DIST += env.d/flatpak.env.in
DISTCLEANFILES += xdg-app.env DISTCLEANFILES += flatpak.env
xdg-app.env: env.d/xdg-app.env.in flatpak.env: env.d/flatpak.env.in
$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \ $(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@

4
README.md
View File

@ -1,6 +1,6 @@
# xdg-app # Flatpak
xdg-app is a system for building, distributing and running sandboxed flatpak is a system for building, distributing and running sandboxed
desktop applications on Linux. desktop applications on Linux.
See https://wiki.gnome.org/Projects/SandboxedApps for more information. See https://wiki.gnome.org/Projects/SandboxedApps for more information.

8
app/Makefile.am.inc
View File

@ -1,8 +1,8 @@
bin_PROGRAMS += \ bin_PROGRAMS += \
xdg-app \ flatpak \
$(NULL) $(NULL)
xdg_app_SOURCES = \ flatpak_SOURCES = \
app/flatpak-main.c \ app/flatpak-main.c \
app/flatpak-builtins.h \ app/flatpak-builtins.h \
app/flatpak-builtins-add-remote.c \ app/flatpak-builtins-add-remote.c \
@ -30,5 +30,5 @@ xdg_app_SOURCES = \
$(xdp_dbus_built_sources) \ $(xdp_dbus_built_sources) \
$(NULL) $(NULL)
xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la flatpak_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS) flatpak_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)

10
app/flatpak-builtins-build-bundle.c
View File

@ -50,7 +50,7 @@ static GOptionEntry options[] = {
{ "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to bundle for", "ARCH" }, { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to bundle for", "ARCH" },
{ "repo-url", 0, 0, G_OPTION_ARG_STRING, &opt_repo_url, "Url for repo", "URL" }, { "repo-url", 0, 0, G_OPTION_ARG_STRING, &opt_repo_url, "Url for repo", "URL" },
{ "gpg-keys", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_file, "Add GPG key from FILE (- for stdin)", "FILE" }, { "gpg-keys", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_file, "Add GPG key from FILE (- for stdin)", "FILE" },
{ "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of xdg-app bundle"}, { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of flatpak bundle"},
{ NULL } { NULL }
}; };
@ -132,7 +132,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
* later. Furthermore, the use of an uint32 lets use detect * later. Furthermore, the use of an uint32 lets use detect
* byteorder issues. * byteorder issues.
*/ */
g_variant_builder_add (&metadata_builder, "{sv}", "xdg-app", g_variant_builder_add (&metadata_builder, "{sv}", "flatpak",
g_variant_new_uint32 (0xe5890001)); g_variant_new_uint32 (0xe5890001));
g_variant_builder_add (&metadata_builder, "{sv}", "ref", g_variant_new_string (full_branch)); g_variant_builder_add (&metadata_builder, "{sv}", "ref", g_variant_new_string (full_branch));
@ -180,7 +180,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
int i; int i;
g_autoptr(GFile) icons_dir = g_autoptr(GFile) icons_dir =
g_file_resolve_relative_path (root, g_file_resolve_relative_path (root,
"files/share/app-info/icons/xdg-app"); "files/share/app-info/icons/flatpak");
const char *icon_sizes[] = { "64x64", "128x128" }; const char *icon_sizes[] = { "64x64", "128x128" };
const char *icon_sizes_key[] = { "icon-64", "icon-128" }; const char *icon_sizes_key[] = { "icon-64", "icon-128" };
g_autofree char *icon_name = g_strconcat (name, ".png", NULL); g_autofree char *icon_name = g_strconcat (name, ".png", NULL);
@ -749,7 +749,7 @@ build_oci (OstreeRepo *repo, GFile *file,
return FALSE; return FALSE;
#elif !defined(HAVE_LIBARCHIVE) #elif !defined(HAVE_LIBARCHIVE)
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"This version of xdg-app is not compiled with libarchive support"); "This version of flatpak is not compiled with libarchive support");
return FALSE; return FALSE;
#else #else
struct free_write_archive archive *a = NULL; struct free_write_archive archive *a = NULL;
@ -876,7 +876,7 @@ build_oci (OstreeRepo *repo, GFile *file,
if (archive_write_close (a) != ARCHIVE_OK) if (archive_write_close (a) != ARCHIVE_OK)
return propagate_libarchive_error (error, a); return propagate_libarchive_error (error, a);
g_print ("WARNING: the oci format produced by xdg-app is experimental and unstable.\n" g_print ("WARNING: the oci format produced by flatpak is experimental and unstable.\n"
"Don't use this for anything but experiments for now\n"); "Don't use this for anything but experiments for now\n");
return TRUE; return TRUE;

4
app/flatpak-builtins-build-import-bundle.c
View File

@ -36,7 +36,7 @@ static gboolean opt_oci = FALSE;
static GOptionEntry options[] = { static GOptionEntry options[] = {
{ "ref", 0, 0, G_OPTION_ARG_STRING, &opt_ref, "Override the ref used for the imported bundle", "REF" }, { "ref", 0, 0, G_OPTION_ARG_STRING, &opt_ref, "Override the ref used for the imported bundle", "REF" },
{ "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of xdg-app bundle"}, { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of flatpak bundle"},
{ NULL } { NULL }
}; };
@ -52,7 +52,7 @@ import_oci (OstreeRepo *repo, GFile *file,
return FALSE; return FALSE;
#elif !defined(HAVE_LIBARCHIVE) #elif !defined(HAVE_LIBARCHIVE)
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"This version of xdg-app is not compiled with libarchive support"); "This version of flatpak is not compiled with libarchive support");
return FALSE; return FALSE;
#else #else
g_autoptr(OstreeMutableTree) archive_mtree = NULL; g_autoptr(OstreeMutableTree) archive_mtree = NULL;

8
builder/Makefile.am.inc
View File

@ -1,8 +1,8 @@
bin_PROGRAMS += \ bin_PROGRAMS += \
xdg-app-builder \ flatpak-builder \
$(NULL) $(NULL)
xdg_app_builder_SOURCES = \ flatpak_builder_SOURCES = \
builder/builder-main.c \ builder/builder-main.c \
builder/builder-manifest.c \ builder/builder-manifest.c \
builder/builder-manifest.h \ builder/builder-manifest.h \
@ -34,6 +34,6 @@ xdg_app_builder_SOURCES = \
builder/builder-utils.h \ builder/builder-utils.h \
$(NULL) $(NULL)
xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \ flatpak_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \
libglnx.la libflatpak-common.la libglnx.la libflatpak-common.la
xdg_app_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS) flatpak_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)

6
builder/builder-context.c
View File

@ -137,7 +137,7 @@ builder_context_constructed (GObject *object)
{ {
BuilderContext *self = BUILDER_CONTEXT (object); BuilderContext *self = BUILDER_CONTEXT (object);
self->state_dir = g_file_get_child (self->base_dir, ".xdg-app-builder"); self->state_dir = g_file_get_child (self->base_dir, ".flatpak-builder");
self->download_dir = g_file_get_child (self->state_dir, "downloads"); self->download_dir = g_file_get_child (self->state_dir, "downloads");
self->build_dir = g_file_get_child (self->state_dir, "build"); self->build_dir = g_file_get_child (self->state_dir, "build");
self->cache_dir = g_file_get_child (self->state_dir, "cache"); self->cache_dir = g_file_get_child (self->state_dir, "cache");
@ -224,7 +224,7 @@ builder_context_get_soup_session (BuilderContext *self)
{ {
const char *http_proxy; const char *http_proxy;
self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "xdg-app-builder ", self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "flatpak-builder ",
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
SOUP_SESSION_USE_THREAD_CONTEXT, TRUE, SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
SOUP_SESSION_TIMEOUT, 60, SOUP_SESSION_TIMEOUT, 60,
@ -391,7 +391,7 @@ builder_context_extend_env (BuilderContext *self,
const char *old_path = g_environ_getenv (envp, "PATH"); const char *old_path = g_environ_getenv (envp, "PATH");
g_autofree char *new_path = NULL; g_autofree char *new_path = NULL;
if (old_path == NULL) if (old_path == NULL)
old_path = "/app/bin:/usr/bin"; /* This is the xdg-app default PATH */ old_path = "/app/bin:/usr/bin"; /* This is the flatpak default PATH */
new_path = g_strdup_printf ("/run/ccache/bin:%s", old_path); new_path = g_strdup_printf ("/run/ccache/bin:%s", old_path);
envp = g_environ_setenv (envp, "PATH", new_path, TRUE); envp = g_environ_setenv (envp, "PATH", new_path, TRUE);

2
builder/builder-main.c
View File

@ -112,7 +112,7 @@ do_export (BuilderContext *build_context,
g_autoptr(GSubprocess) subp = NULL; g_autoptr(GSubprocess) subp = NULL;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build-export")); g_ptr_array_add (args, g_strdup ("build-export"));
g_ptr_array_add (args, g_strdup_printf ("--arch=%s", builder_context_get_arch (build_context))); g_ptr_array_add (args, g_strdup_printf ("--arch=%s", builder_context_get_arch (build_context)));

24
builder/builder-manifest.c
View File

@ -818,7 +818,7 @@ builder_manifest_get_branch (BuilderManifest *self)
} }
static char * static char *
xdg_app (GError **error, flatpak (GError **error,
...) ...)
{ {
gboolean res; gboolean res;
@ -826,7 +826,7 @@ xdg_app (GError **error,
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);
res = flatpak_spawn (NULL, &output, error, "xdg-app", ap); res = flatpak_spawn (NULL, &output, error, "flatpak", ap);
va_end (ap); va_end (ap);
if (res) if (res)
@ -846,14 +846,14 @@ builder_manifest_start (BuilderManifest *self,
arch_option = g_strdup_printf ("--arch=%s", builder_context_get_arch (context)); arch_option = g_strdup_printf ("--arch=%s", builder_context_get_arch (context));
self->sdk_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->sdk, self->sdk_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->sdk,
builder_manifest_get_runtime_version (self), NULL); builder_manifest_get_runtime_version (self), NULL);
if (self->sdk_commit == NULL) if (self->sdk_commit == NULL)
return flatpak_fail (error, "Unable to find sdk %s version %s", return flatpak_fail (error, "Unable to find sdk %s version %s",
self->sdk, self->sdk,
builder_manifest_get_runtime_version (self)); builder_manifest_get_runtime_version (self));
self->runtime_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->runtime, self->runtime_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->runtime,
builder_manifest_get_runtime_version (self), NULL); builder_manifest_get_runtime_version (self), NULL);
if (self->runtime_commit == NULL) if (self->runtime_commit == NULL)
return flatpak_fail (error, "Unable to find runtime %s version %s", return flatpak_fail (error, "Unable to find runtime %s version %s",
@ -899,7 +899,7 @@ builder_manifest_init_app_dir (BuilderManifest *self,
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build-init")); g_ptr_array_add (args, g_strdup ("build-init"));
if (self->writable_sdk || self->build_runtime) if (self->writable_sdk || self->build_runtime)
{ {
@ -1129,7 +1129,7 @@ command (GFile *app_dir,
int i; int i;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--nofilesystem=host")); g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
@ -1306,7 +1306,7 @@ appstream_compose (GFile *app_dir,
va_list ap; va_list ap;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--nofilesystem=host")); g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
g_ptr_array_add (args, g_file_get_path (app_dir)); g_ptr_array_add (args, g_file_get_path (app_dir));
@ -1550,7 +1550,7 @@ builder_manifest_cleanup (BuilderManifest *self,
g_print ("Running appstream-compose\n"); g_print ("Running appstream-compose\n");
if (!appstream_compose (app_dir, error, if (!appstream_compose (app_dir, error,
self->build_runtime ? "--prefix=/usr" : "--prefix=/app", self->build_runtime ? "--prefix=/usr" : "--prefix=/app",
"--origin=xdg-app", "--origin=flatpak",
basename_arg, basename_arg,
self->id, self->id,
NULL)) NULL))
@ -1605,7 +1605,7 @@ builder_manifest_finish (BuilderManifest *self,
} }
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build-finish")); g_ptr_array_add (args, g_strdup ("build-finish"));
if (self->command) if (self->command)
g_ptr_array_add (args, g_strdup_printf ("--command=%s", self->command)); g_ptr_array_add (args, g_strdup_printf ("--command=%s", self->command));
@ -1771,7 +1771,7 @@ builder_manifest_create_platform (BuilderManifest *self,
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build-init")); g_ptr_array_add (args, g_strdup ("build-init"));
g_ptr_array_add (args, g_strdup ("--update")); g_ptr_array_add (args, g_strdup ("--update"));
g_ptr_array_add (args, g_strdup ("--writable-sdk")); g_ptr_array_add (args, g_strdup ("--writable-sdk"));
@ -1985,7 +1985,7 @@ builder_manifest_run (BuilderManifest *self,
return FALSE; return FALSE;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("build"));
build_dir_path = g_file_get_path (builder_context_get_build_dir (context)); build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
@ -2038,7 +2038,7 @@ builder_manifest_run (BuilderManifest *self,
if (!execvp ((char *) args->pdata[0], (char **) args->pdata)) if (!execvp ((char *) args->pdata[0], (char **) args->pdata))
{ {
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start xdg-app build"); g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start flatpak build");
return FALSE; return FALSE;
} }

2
builder/builder-module.c
View File

@ -583,7 +583,7 @@ build (GFile *app_dir,
int i; int i;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("build"));
source_dir_path_canonical = canonicalize_file_name (source_dir_path); source_dir_path_canonical = canonicalize_file_name (source_dir_path);

2
builder/builder-source-shell.c
View File

@ -126,7 +126,7 @@ run_script (BuilderContext *context,
g_autofree char *source_dir_path_canonical = NULL; g_autofree char *source_dir_path_canonical = NULL;
args = g_ptr_array_new_with_free_func (g_free); args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("xdg-app")); g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build")); g_ptr_array_add (args, g_strdup ("build"));
source_dir_path_canonical = canonicalize_file_name (source_dir_path); source_dir_path_canonical = canonicalize_file_name (source_dir_path);

6
common/Makefile.am.inc
View File

@ -4,12 +4,12 @@ dbus_built_sources = common/flatpak-dbus.c common/flatpak-dbus.h
systemd_dbus_built_sources = common/flatpak-systemd-dbus.c common/flatpak-systemd-dbus.h systemd_dbus_built_sources = common/flatpak-systemd-dbus.c common/flatpak-systemd-dbus.h
BUILT_SOURCES += $(dbus_built_sources) $(systemd_dbus_built_sources) BUILT_SOURCES += $(dbus_built_sources) $(systemd_dbus_built_sources)
$(dbus_built_sources) : data/org.freedesktop.XdgApp.xml $(dbus_built_sources) : data/org.freedesktop.Flatpak.xml
$(AM_V_GEN) $(GDBUS_CODEGEN) \ $(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix org.freedesktop.XdgApp. \ --interface-prefix org.freedesktop.Flatpak. \
--c-namespace Flatpak \ --c-namespace Flatpak \
--generate-c-code $(builddir)/common/flatpak-dbus \ --generate-c-code $(builddir)/common/flatpak-dbus \
$(srcdir)/data/org.freedesktop.XdgApp.xml \ $(srcdir)/data/org.freedesktop.Flatpak.xml \
$(NULL) $(NULL)
$(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml

2
common/flatpak-db.c
View File

@ -1,4 +1,4 @@
/* xdg-app-db.c /* flatpak-db.c
* *
* Copyright (C) 2015 Red Hat, Inc * Copyright (C) 2015 Red Hat, Inc
* *

2
common/flatpak-db.h
View File

@ -1,4 +1,4 @@
/* xdg-app-db.h /* flatpak-db.h
* *
* Copyright © 2015 Red Hat, Inc * Copyright © 2015 Red Hat, Inc
* *

36
common/flatpak-dir.c
View File

@ -37,19 +37,19 @@
#include "errno.h" #include "errno.h"
#define NO_SYSTEM_HELPER ((XdgAppSystemHelper *) (gpointer) 1) #define NO_SYSTEM_HELPER ((FlatpakSystemHelper *) (gpointer) 1)
struct FlatpakDir struct FlatpakDir
{ {
GObject parent; GObject parent;
gboolean user; gboolean user;
GFile *basedir; GFile *basedir;
OstreeRepo *repo; OstreeRepo *repo;
XdgAppSystemHelper *system_helper; FlatpakSystemHelper *system_helper;
SoupSession *soup_session; SoupSession *soup_session;
}; };
typedef struct typedef struct
@ -75,7 +75,7 @@ typedef struct
G_DEFINE_TYPE (FlatpakDir, flatpak_dir, G_TYPE_OBJECT) G_DEFINE_TYPE (FlatpakDir, flatpak_dir, G_TYPE_OBJECT)
G_DEFINE_TYPE (FlatpakDeploy, flatpak_deploy, G_TYPE_OBJECT) G_DEFINE_TYPE (FlatpakDeploy, flatpak_deploy, G_TYPE_OBJECT)
G_DEFINE_QUARK (xdg - app - dir - error - quark, flatpak_dir_error) G_DEFINE_QUARK (flatpak-dir-error-quark, flatpak_dir_error)
enum { enum {
PROP_0, PROP_0,
@ -199,16 +199,16 @@ flatpak_ensure_user_cache_dir_location (GError **error)
return g_steal_pointer (&cache_dir); return g_steal_pointer (&cache_dir);
} }
static XdgAppSystemHelper * static FlatpakSystemHelper *
flatpak_dir_get_system_helper (FlatpakDir *self) flatpak_dir_get_system_helper (FlatpakDir *self)
{ {
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
if (g_once_init_enter (&self->system_helper)) if (g_once_init_enter (&self->system_helper))
{ {
XdgAppSystemHelper *system_helper; FlatpakSystemHelper *system_helper;
system_helper = system_helper =
xdg_app_system_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, flatpak_system_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
"org.freedesktop.Flatpak.SystemHelper", "org.freedesktop.Flatpak.SystemHelper",
@ -231,7 +231,7 @@ flatpak_dir_get_system_helper (FlatpakDir *self)
gboolean gboolean
flatpak_dir_use_child_repo (FlatpakDir *self) flatpak_dir_use_child_repo (FlatpakDir *self)
{ {
XdgAppSystemHelper *system_helper; FlatpakSystemHelper *system_helper;
if (self->user || getuid () == 0) if (self->user || getuid () == 0)
return FALSE; return FALSE;
@ -547,7 +547,7 @@ flatpak_dir_get_repo (FlatpakDir *self)
} }
/* This is an exclusive per xdg-app installation file lock that is taken /* This is an exclusive per flatpak installation file lock that is taken
* whenever any config in the directory outside the repo is to be changed. For * whenever any config in the directory outside the repo is to be changed. For
* instance deployements, overrides or active commit changes. * instance deployements, overrides or active commit changes.
* *
@ -2041,7 +2041,7 @@ export_desktop_file (const char *app,
g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL); g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL);
new_exec = g_string_new (""); new_exec = g_string_new ("");
g_string_append_printf (new_exec, FLATPAK_BINDIR "/xdg-app run --branch=%s --arch=%s", escaped_branch, escaped_arch); g_string_append_printf (new_exec, FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", escaped_branch, escaped_arch);
old_exec = g_key_file_get_string (keyfile, groups[i], "Exec", NULL); old_exec = g_key_file_get_string (keyfile, groups[i], "Exec", NULL);
if (old_exec && g_shell_parse_argv (old_exec, &old_argc, &old_argv, NULL) && old_argc >= 1) if (old_exec && g_shell_parse_argv (old_exec, &old_argc, &old_argv, NULL) && old_argc >= 1)
@ -2868,7 +2868,7 @@ flatpak_dir_install (FlatpakDir *self,
g_autoptr(OstreeRepo) child_repo = NULL; g_autoptr(OstreeRepo) child_repo = NULL;
g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT; g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT;
char *empty_subpaths[] = {NULL}; char *empty_subpaths[] = {NULL};
XdgAppSystemHelper *system_helper; FlatpakSystemHelper *system_helper;
if (no_pull) if (no_pull)
return flatpak_fail (error, "No-pull install not supported without root permissions"); return flatpak_fail (error, "No-pull install not supported without root permissions");
@ -2889,7 +2889,7 @@ flatpak_dir_install (FlatpakDir *self,
progress, cancellable, error)) progress, cancellable, error))
return FALSE; return FALSE;
if (!xdg_app_system_helper_call_deploy_sync (system_helper, if (!flatpak_system_helper_call_deploy_sync (system_helper,
gs_file_get_path_cached (ostree_repo_get_path (child_repo)), gs_file_get_path_cached (ostree_repo_get_path (child_repo)),
FLATPAK_HELPER_DEPLOY_FLAGS_NONE, FLATPAK_HELPER_DEPLOY_FLAGS_NONE,
ref, ref,
@ -2943,7 +2943,7 @@ flatpak_dir_update (FlatpakDir *self,
char *empty_subpaths[] = {NULL}; char *empty_subpaths[] = {NULL};
g_autofree char *pulled_checksum = NULL; g_autofree char *pulled_checksum = NULL;
g_autofree char *active_checksum = NULL; g_autofree char *active_checksum = NULL;
XdgAppSystemHelper *system_helper; FlatpakSystemHelper *system_helper;
if (no_pull) if (no_pull)
return flatpak_fail (error, "No-pull update not supported without root permissions"); return flatpak_fail (error, "No-pull update not supported without root permissions");
@ -2974,7 +2974,7 @@ flatpak_dir_update (FlatpakDir *self,
if (g_strcmp0 (active_checksum, pulled_checksum) != 0) if (g_strcmp0 (active_checksum, pulled_checksum) != 0)
{ {
if (!xdg_app_system_helper_call_deploy_sync (system_helper, if (!flatpak_system_helper_call_deploy_sync (system_helper,
gs_file_get_path_cached (ostree_repo_get_path (child_repo)), gs_file_get_path_cached (ostree_repo_get_path (child_repo)),
FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE, FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE,
ref, ref,

4
common/flatpak-portal-error.c
View File

@ -1,4 +1,4 @@
/* xdg-app-error.c /* flatpak-error.c
* *
* Copyright (C) 2015 Red Hat, Inc * Copyright (C) 2015 Red Hat, Inc
* *
@ -40,7 +40,7 @@ flatpak_portal_error_quark (void)
{ {
static volatile gsize quark_volatile = 0; static volatile gsize quark_volatile = 0;
g_dbus_error_register_error_domain ("xdg-app-portal-error-quark", g_dbus_error_register_error_domain ("flatpak-portal-error-quark",
&quark_volatile, &quark_volatile,
flatpak_error_entries, flatpak_error_entries,
G_N_ELEMENTS (flatpak_error_entries)); G_N_ELEMENTS (flatpak_error_entries));

2
common/flatpak-portal-error.h
View File

@ -1,4 +1,4 @@
/* xdg-app-error.c /* flatpak-portal-error.c
* *
* Copyright (C) 2015 Red Hat, Inc * Copyright (C) 2015 Red Hat, Inc
* *

22
common/flatpak-run.c
View File

@ -1318,7 +1318,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array,
#ifdef ENABLE_XAUTH #ifdef ENABLE_XAUTH
int fd; int fd;
fd = g_file_open_tmp ("xdg-app-xauth-XXXXXX", &tmp_path, NULL); fd = g_file_open_tmp ("flatpak-xauth-XXXXXX", &tmp_path, NULL);
if (fd >= 0) if (fd >= 0)
{ {
FILE *output = fdopen (fd, "wb"); FILE *output = fdopen (fd, "wb");
@ -1795,7 +1795,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
g_autofree char *path = NULL; g_autofree char *path = NULL;
int fd; int fd;
fd = g_file_open_tmp ("xdg-app-user-dir-XXXXXX.dirs", &tmp_path, NULL); fd = g_file_open_tmp ("flatpak-user-dir-XXXXXX.dirs", &tmp_path, NULL);
if (fd >= 0) if (fd >= 0)
{ {
close (fd); close (fd);
@ -2087,7 +2087,7 @@ flatpak_run_in_transient_unit (const char *appid, GError **error)
if (!manager) if (!manager)
goto out; goto out;
name = g_strdup_printf ("xdg-app-%s-%d.scope", appid, getpid ()); name = g_strdup_printf ("flatpak-%s-%d.scope", appid, getpid ());
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)"));
@ -2202,14 +2202,14 @@ add_app_info_args (GPtrArray *argv_array,
g_autofree char *tmp_path = NULL; g_autofree char *tmp_path = NULL;
int fd; int fd;
fd = g_file_open_tmp ("xdg-app-context-XXXXXX", &tmp_path, NULL); fd = g_file_open_tmp ("flatpak-context-XXXXXX", &tmp_path, NULL);
if (fd >= 0) if (fd >= 0)
{ {
g_autoptr(GKeyFile) keyfile = NULL; g_autoptr(GKeyFile) keyfile = NULL;
g_autoptr(GFile) files = NULL; g_autoptr(GFile) files = NULL;
g_autofree char *files_path = NULL; g_autofree char *files_path = NULL;
g_autofree char *fd_str = NULL; g_autofree char *fd_str = NULL;
g_autofree char *dest = g_strdup_printf ("/run/user/%d/xdg-app-info", getuid ()); g_autofree char *dest = g_strdup_printf ("/run/user/%d/flatpak-info", getuid ());
close (fd); close (fd);
@ -2247,17 +2247,17 @@ static void
add_monitor_path_args (GPtrArray *argv_array, add_monitor_path_args (GPtrArray *argv_array,
char ***envp_p) char ***envp_p)
{ {
g_autoptr(AutoXdgAppSessionHelper) session_helper = NULL; g_autoptr(AutoFlatpakSessionHelper) session_helper = NULL;
g_autofree char *monitor_path = NULL; g_autofree char *monitor_path = NULL;
session_helper = session_helper =
xdg_app_session_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, flatpak_session_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
"org.freedesktop.Flatpak", "org.freedesktop.Flatpak",
"/org/freedesktop/Flatpak/SessionHelper", "/org/freedesktop/Flatpak/SessionHelper",
NULL, NULL); NULL, NULL);
if (session_helper && if (session_helper &&
xdg_app_session_helper_call_request_monitor_sync (session_helper, flatpak_session_helper_call_request_monitor_sync (session_helper,
&monitor_path, &monitor_path,
NULL, NULL)) NULL, NULL))
{ {
@ -2545,7 +2545,7 @@ setup_seccomp (GPtrArray *argv_array,
/* This *adds* the target arch, instead of replacing the /* This *adds* the target arch, instead of replacing the
native one. This is not ideal, because we'd like to only native one. This is not ideal, because we'd like to only
allow the target arch, but we can't really disallow the allow the target arch, but we can't really disallow the
native arch at this point, because then xdg-app-helper native arch at this point, because then bubblewrap
couldn't continue runnning. */ couldn't continue runnning. */
r = seccomp_arch_add (seccomp, arch_id); r = seccomp_arch_add (seccomp, arch_id);
if (r < 0 && r != -EEXIST) if (r < 0 && r != -EEXIST)
@ -2612,7 +2612,7 @@ setup_seccomp (GPtrArray *argv_array,
r = seccomp_rule_add_exact (seccomp, SCMP_ACT_ERRNO (EAFNOSUPPORT), SCMP_SYS (socket), 1, SCMP_A0 (SCMP_CMP_EQ, family)); r = seccomp_rule_add_exact (seccomp, SCMP_ACT_ERRNO (EAFNOSUPPORT), SCMP_SYS (socket), 1, SCMP_A0 (SCMP_CMP_EQ, family));
} }
fd = g_file_open_tmp ("xdg-app-seccomp-XXXXXX", &path, error); fd = g_file_open_tmp ("flatpak-seccomp-XXXXXX", &path, error);
if (fd == -1) if (fd == -1)
return FALSE; return FALSE;
@ -2969,7 +2969,7 @@ flatpak_run_app (const char *app_ref,
close (sync_fds[1]); close (sync_fds[1]);
add_args (argv_array, add_args (argv_array,
/* Not in base, because we don't want this for xdg-app build */ /* Not in base, because we don't want this for flatpak build */
"--symlink", "/app/lib/debug/source", "/run/build", "--symlink", "/app/lib/debug/source", "/run/build",
"--symlink", "/usr/lib/debug/source", "/run/build-runtime", "--symlink", "/usr/lib/debug/source", "/run/build-runtime",
NULL); NULL);

18
common/flatpak-utils.c
View File

@ -1023,10 +1023,10 @@ got_credentials_cb (GObject *source_object,
const char *unit = lines[i] + strlen ("1:name=systemd:"); const char *unit = lines[i] + strlen ("1:name=systemd:");
g_autofree char *scope = g_path_get_basename (unit); g_autofree char *scope = g_path_get_basename (unit);
if (g_str_has_prefix (scope, "xdg-app-") && if (g_str_has_prefix (scope, "flatpak-") &&
g_str_has_suffix (scope, ".scope")) g_str_has_suffix (scope, ".scope"))
{ {
const char *name = scope + strlen ("xdg-app-"); const char *name = scope + strlen ("flatpak-");
char *dash = strchr (name, '-'); char *dash = strchr (name, '-');
if (dash != NULL) if (dash != NULL)
{ {
@ -1532,9 +1532,9 @@ flatpak_repo_set_title (OstreeRepo *repo,
config = ostree_repo_copy_config (repo); config = ostree_repo_copy_config (repo);
if (title) if (title)
g_key_file_set_string (config, "xdg-app", "title", title); g_key_file_set_string (config, "flatpak", "title", title);
else else
g_key_file_remove_key (config, "xdg-app", "title", NULL); g_key_file_remove_key (config, "flatpak", "title", NULL);
if (!ostree_repo_write_config (repo, config, error)) if (!ostree_repo_write_config (repo, config, error))
return FALSE; return FALSE;
@ -1633,7 +1633,7 @@ flatpak_repo_update (OstreeRepo *repo,
config = ostree_repo_get_config (repo); config = ostree_repo_get_config (repo);
if (config) if (config)
title = g_key_file_get_string (config, "xdg-app", "title", NULL); title = g_key_file_get_string (config, "flatpak", "title", NULL);
if (title) if (title)
g_variant_builder_add (&builder, "{sv}", "xa.title", g_variant_builder_add (&builder, "{sv}", "xa.title",
@ -1779,7 +1779,7 @@ validate_component (FlatpakXml *component,
bundle->attribute_names = g_new0 (char *, 2 * 4); bundle->attribute_names = g_new0 (char *, 2 * 4);
bundle->attribute_values = g_new0 (char *, 2 * 4); bundle->attribute_values = g_new0 (char *, 2 * 4);
bundle->attribute_names[0] = g_strdup ("type"); bundle->attribute_names[0] = g_strdup ("type");
bundle->attribute_values[0] = g_strdup ("xdg-app"); bundle->attribute_values[0] = g_strdup ("flatpak");
i = 1; i = 1;
if (runtime) if (runtime)
@ -1905,7 +1905,7 @@ copy_icon (const char *id,
g_autoptr(GFile) icons_dir = g_autoptr(GFile) icons_dir =
g_file_resolve_relative_path (root, g_file_resolve_relative_path (root,
"files/share/app-info/icons/xdg-app"); "files/share/app-info/icons/flatpak");
g_autoptr(GFile) size_dir = g_file_get_child (icons_dir, size); g_autoptr(GFile) size_dir = g_file_get_child (icons_dir, size);
g_autoptr(GFile) icon_file = g_file_get_child (size_dir, icon_name); g_autoptr(GFile) icon_file = g_file_get_child (size_dir, icon_name);
g_autoptr(GFile) dest_dir = g_file_get_child (dest, "icons"); g_autoptr(GFile) dest_dir = g_file_get_child (dest, "icons");
@ -2049,7 +2049,7 @@ flatpak_appstream_xml_new (void)
appstream_components->attribute_names[0] = g_strdup ("version"); appstream_components->attribute_names[0] = g_strdup ("version");
appstream_components->attribute_values[0] = g_strdup ("0.8"); appstream_components->attribute_values[0] = g_strdup ("0.8");
appstream_components->attribute_names[1] = g_strdup ("origin"); appstream_components->attribute_names[1] = g_strdup ("origin");
appstream_components->attribute_values[1] = g_strdup ("xdg-app"); appstream_components->attribute_values[1] = g_strdup ("flatpak");
return appstream_root; return appstream_root;
} }
@ -2124,7 +2124,7 @@ flatpak_repo_generate_appstream (OstreeRepo *repo,
{ {
GHashTableIter iter2; GHashTableIter iter2;
const char *arch = key; const char *arch = key;
g_autofree char *tmpdir = g_strdup ("/tmp/xdg-app-appstream-XXXXXX"); g_autofree char *tmpdir = g_strdup ("/tmp/flatpak-appstream-XXXXXX");
g_autoptr(FlatpakTempDir) tmpdir_file = NULL; g_autoptr(FlatpakTempDir) tmpdir_file = NULL;
g_autoptr(GFile) appstream_file = NULL; g_autoptr(GFile) appstream_file = NULL;
g_autoptr(GFile) root = NULL; g_autoptr(GFile) root = NULL;

4
common/flatpak-utils.h
View File

@ -292,8 +292,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupURI, soup_uri_free)
/* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per: /* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per:
* https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59 * https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59
*/ */
typedef XdgAppSessionHelper AutoXdgAppSessionHelper; typedef FlatpakSessionHelper AutoFlatpakSessionHelper;
G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoXdgAppSessionHelper, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoFlatpakSessionHelper, g_object_unref)
typedef struct FlatpakXml FlatpakXml; typedef struct FlatpakXml FlatpakXml;

22
completion/xdg-app → completion/flatpak
View File

@ -7,7 +7,7 @@ __contains_word () {
done done
} }
_xdg-app() { _flatpak() {
local cur prev local cur prev
local cur=${COMP_WORDS[COMP_CWORD]} local cur=${COMP_WORDS[COMP_CWORD]}
local prev=${COMP_WORDS[COMP_CWORD-1]} local prev=${COMP_WORDS[COMP_CWORD-1]}
@ -122,13 +122,13 @@ _xdg-app() {
comps=$(compgen -A command) comps=$(compgen -A command)
;; ;;
--var) --var)
comps=$(xdg-app $mode list --runtime) comps=$(flatpak $mode list --runtime)
;; ;;
--runtime) --runtime)
if __contains_word "$verb" ${VERBS[KIND]}; then if __contains_word "$verb" ${VERBS[KIND]}; then
comps=XXX comps=XXX
else else
comps=$(xdg-app $mode list --runtime) comps=$(flatpak $mode list --runtime)
fi fi
;; ;;
--share|--noshare) --share|--noshare)
@ -287,7 +287,7 @@ _xdg-app() {
else else
case "$verb" in case "$verb" in
remote-add|remote-modify|remote-delete|remote-ls) remote-add|remote-modify|remote-delete|remote-ls)
comps=$(xdg-app $mode remote-list) comps=$(flatpak $mode remote-list)
;; ;;
install) install)
@ -296,12 +296,12 @@ _xdg-app() {
compopt -o filenames compopt -o filenames
else else
if [[ -z $remote ]]; then if [[ -z $remote ]]; then
comps=$(xdg-app $mode remote-list) comps=$(flatpak $mode remote-list)
if [[ $mode == "--system" ]]; then if [[ $mode == "--system" ]]; then
comps="$comps --user" comps="$comps --user"
fi fi
elif [[ -z $name ]]; then elif [[ -z $name ]]; then
comps=$(xdg-app remote-ls $mode $kind $remote) comps=$(flatpak remote-ls $mode $kind $remote)
else else
comps='' # FIXME: branches comps='' # FIXME: branches
fi fi
@ -314,7 +314,7 @@ _xdg-app() {
update|uninstall) update|uninstall)
if [[ -z $name ]]; then if [[ -z $name ]]; then
comps=$(xdg-app $mode $kind list) comps=$(flatpak $mode $kind list)
else else
comps='' # FIXME: branches comps='' # FIXME: branches
fi fi
@ -323,7 +323,7 @@ _xdg-app() {
run|override) run|override)
# run doesn't take --user or --system, so don't use mode here # run doesn't take --user or --system, so don't use mode here
if [[ -z $name ]]; then if [[ -z $name ]]; then
comps=$(xdg-app list --app) comps=$(flatpak list --app)
fi fi
;; ;;
@ -333,9 +333,9 @@ _xdg-app() {
comps='' comps=''
compopt -o dirnames compopt -o dirnames
elif [[ -z $sdk ]]; then elif [[ -z $sdk ]]; then
comps="$(xdg-app list --runtime) $(xdg-app --user list --runtime)" comps="$(flatpak list --runtime) $(flatpak --user list --runtime)"
elif [[ -z $name ]]; then elif [[ -z $name ]]; then
comps="$(xdg-app list --runtime) $(xdg-app --user list --runtime)" comps="$(flatpak list --runtime) $(flatpak --user list --runtime)"
else else
comps='' # FIXME: branches comps='' # FIXME: branches
fi fi
@ -402,4 +402,4 @@ _xdg-app() {
return 0 return 0
} }
complete -F _xdg-app xdg-app complete -F _flatpak flatpak

4
data/Makefile.am.inc
View File

@ -1,11 +1,11 @@
introspectiondir = $(datadir)/dbus-1/interfaces introspectiondir = $(datadir)/dbus-1/interfaces
introspection_DATA = \ introspection_DATA = \
data/org.freedesktop.portal.Documents.xml \ data/org.freedesktop.portal.Documents.xml \
data/org.freedesktop.XdgApp.xml \ data/org.freedesktop.Flatpak.xml \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
data/org.freedesktop.portal.Documents.xml \ data/org.freedesktop.portal.Documents.xml \
data/org.freedesktop.systemd1.xml \ data/org.freedesktop.systemd1.xml \
data/org.freedesktop.XdgApp.xml \ data/org.freedesktop.Flatpak.xml \
$(NULL) $(NULL)

6
data/org.freedesktop.XdgApp.xml → data/org.freedesktop.Flatpak.xml
View File

@ -24,14 +24,14 @@
--> -->
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<interface name='org.freedesktop.XdgApp.SessionHelper'> <interface name='org.freedesktop.Flatpak.SessionHelper'>
<method name="RequestMonitor"> <method name="RequestMonitor">
<arg type='ay' name='path' direction='out'/> <arg type='ay' name='path' direction='out'/>
</method> </method>
</interface> </interface>
<interface name='org.freedesktop.XdgApp.PermissionStore'> <interface name='org.freedesktop.Flatpak.PermissionStore'>
<method name="Lookup"> <method name="Lookup">
<arg name='table' type='s' direction='in'/> <arg name='table' type='s' direction='in'/>
@ -82,7 +82,7 @@
</signal> </signal>
</interface> </interface>
<interface name='org.freedesktop.XdgApp.SystemHelper'> <interface name='org.freedesktop.Flatpak.SystemHelper'>
<method name="Deploy"> <method name="Deploy">
<arg type='ay' name='repo_path' direction='in'/> <arg type='ay' name='repo_path' direction='in'/>
<arg type='u' name='flags' direction='in'/> <arg type='u' name='flags' direction='in'/>

10
dbus-proxy/Makefile.am.inc
View File

@ -1,12 +1,12 @@
libexec_PROGRAMS += \ libexec_PROGRAMS += \
xdg-dbus-proxy \ flatpak-dbus-proxy \
$(NULL) $(NULL)
xdg_dbus_proxy_SOURCES = \ flatpak_dbus_proxy_SOURCES = \
dbus-proxy/flatpak-proxy.c \ dbus-proxy/flatpak-proxy.c \
dbus-proxy/flatpak-proxy.h \ dbus-proxy/flatpak-proxy.h \
dbus-proxy/dbus-proxy.c \ dbus-proxy/dbus-proxy.c \
$(NULL) $(NULL)
xdg_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la flatpak_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la
xdg_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy flatpak_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy

50
doc/Makefile.am
View File

@ -15,31 +15,31 @@ XSLTPROC_FLAGS = \
$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
man_MANS = \ man_MANS = \
xdg-app.1 \ flatpak.1 \
xdg-app-remote-add.1 \ flatpak-remote-add.1 \
xdg-app-remote-delete.1 \ flatpak-remote-delete.1 \
xdg-app-remote-list.1 \ flatpak-remote-list.1 \
xdg-app-remote-modify.1 \ flatpak-remote-modify.1 \
xdg-app-remote-ls.1 \ flatpak-remote-ls.1 \
xdg-app-install.1 \ flatpak-install.1 \
xdg-app-update.1 \ flatpak-update.1 \
xdg-app-uninstall.1 \ flatpak-uninstall.1 \
xdg-app-list.1 \ flatpak-list.1 \
xdg-app-info.1 \ flatpak-info.1 \
xdg-app-make-current.1 \ flatpak-make-current.1 \
xdg-app-run.1 \ flatpak-run.1 \
xdg-app-override.1 \ flatpak-override.1 \
xdg-app-enter.1 \ flatpak-enter.1 \
xdg-app-export-file.1 \ flatpak-export-file.1 \
xdg-app-build-init.1 \ flatpak-build-init.1 \
xdg-app-build.1 \ flatpak-build.1 \
xdg-app-build-bundle.1 \ flatpak-build-bundle.1 \
xdg-app-build-import-bundle.1 \ flatpak-build-import-bundle.1 \
xdg-app-build-finish.1 \ flatpak-build-finish.1 \
xdg-app-build-export.1 \ flatpak-build-export.1 \
xdg-app-build-update-repo.1 \ flatpak-build-update-repo.1 \
xdg-app-build-sign.1 \ flatpak-build-sign.1 \
xdg-app-builder.1 \ flatpak-builder.1 \
$(NULL) $(NULL)
xml_files = $(man_MANS:.1=.xml) xml_files = $(man_MANS:.1=.xml)

26
doc/xdg-app-build-bundle.xml → doc/flatpak-build-bundle.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-bundle"> <refentry id="flatpak-build-bundle">
<refentryinfo> <refentryinfo>
<title>xdg-app build-bundle</title> <title>flatpak build-bundle</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-bundle</refentrytitle> <refentrytitle>flatpak build-bundle</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-bundle</refname> <refname>flatpak-build-bundle</refname>
<refpurpose>Create a single file bundle from a local repository</refpurpose> <refpurpose>Create a single file bundle from a local repository</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-bundle</command> <command>flatpak build-bundle</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
<arg choice="plain">FILENAME</arg> <arg choice="plain">FILENAME</arg>
@ -51,7 +51,7 @@
</para> </para>
<para> <para>
The format of the bundle file is that of an ostree static delta The format of the bundle file is that of an ostree static delta
(against an empty base) with some xdg-app specific metadata for (against an empty base) with some flatpak specific metadata for
the application icons and appdata. the application icons and appdata.
</para> </para>
</refsect1> </refsect1>
@ -138,12 +138,12 @@
<para> <para>
<citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

26
doc/xdg-app-build-export.xml → doc/flatpak-build-export.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-export"> <refentry id="flatpak-build-export">
<refentryinfo> <refentryinfo>
<title>xdg-app build-export</title> <title>flatpak build-export</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-export</refentrytitle> <refentrytitle>flatpak build-export</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-export</refname> <refname>flatpak-build-export</refname>
<refpurpose>Create a repository from a build directory</refpurpose> <refpurpose>Create a repository from a build directory</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-export</command> <command>flatpak build-export</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
@ -201,7 +201,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command> <command>$ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
</para> </para>
<programlisting> <programlisting>
Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c
@ -219,12 +219,12 @@ Content Bytes Written: 305
<para> <para>
<citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

22
doc/xdg-app-build-finish.xml → doc/flatpak-build-finish.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-finish"> <refentry id="flatpak-build-finish">
<refentryinfo> <refentryinfo>
<title>xdg-app build-finish</title> <title>flatpak build-finish</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-finish</refentrytitle> <refentrytitle>flatpak build-finish</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-finish</refname> <refname>flatpak-build-finish</refname>
<refpurpose>Finalize a build directory</refpurpose> <refpurpose>Finalize a build directory</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-finish</command> <command>flatpak build-finish</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
</cmdsynopsis> </cmdsynopsis>
@ -265,7 +265,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app build-finish /build/my-app --socket=x11 --share=ipc</command> <command>$ flatpak build-finish /build/my-app --socket=x11 --share=ipc</command>
</para> </para>
<programlisting> <programlisting>
Exporting share/applications/gnome-calculator.desktop Exporting share/applications/gnome-calculator.desktop
@ -281,10 +281,10 @@ Please review the exported files and the metadata
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

18
doc/xdg-app-build-import-bundle.xml → doc/flatpak-build-import-bundle.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-import-bundle"> <refentry id="flatpak-build-import-bundle">
<refentryinfo> <refentryinfo>
<title>xdg-app build-import-bundle</title> <title>flatpak build-import-bundle</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-import-bundle</refentrytitle> <refentrytitle>flatpak build-import-bundle</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-import-bundle</refname> <refname>flatpak-build-import-bundle</refname>
<refpurpose>Import a file bundle into a local repository</refpurpose> <refpurpose>Import a file bundle into a local repository</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-import-bundle</command> <command>flatpak build-import-bundle</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
<arg choice="plain">FILENAME</arg> <arg choice="plain">FILENAME</arg>
@ -96,9 +96,9 @@
<para> <para>
<citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

24
doc/xdg-app-build-init.xml → doc/flatpak-build-init.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-init"> <refentry id="flatpak-build-init">
<refentryinfo> <refentryinfo>
<title>xdg-app build-init</title> <title>flatpak build-init</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-init</refentrytitle> <refentrytitle>flatpak build-init</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-init</refname> <refname>flatpak-build-init</refname>
<refpurpose>Initialize a build directory</refpurpose> <refpurpose>Initialize a build directory</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-init</command> <command>flatpak build-init</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
<arg choice="plain">APPNAME</arg> <arg choice="plain">APPNAME</arg>
@ -101,7 +101,7 @@
<term><option>--writable-sdk</option></term> <term><option>--writable-sdk</option></term>
<listitem><para> <listitem><para>
Initialize /usr with a copy of the sdk, which is writable during xdg-app build. This can be used Initialize /usr with a copy of the sdk, which is writable during flatpak build. This can be used
if you need to install build tools in /usr during the build. This is stored in the if you need to install build tools in /usr during the build. This is stored in the
<filename>usr</filename> subdirectory of the app dir, but will not be part of the final <filename>usr</filename> subdirectory of the app dir, but will not be part of the final
app. app.
@ -162,7 +162,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16</command> <command>$ flatpak build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16</command>
</para> </para>
</refsect1> </refsect1>
@ -171,10 +171,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-build-sign.xml → doc/flatpak-build-sign.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-export"> <refentry id="flatpak-build-export">
<refentryinfo> <refentryinfo>
<title>xdg-app build-sign</title> <title>flatpak build-sign</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-sign</refentrytitle> <refentrytitle>flatpak build-sign</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-sign</refname> <refname>flatpak-build-sign</refname>
<refpurpose>Sign an application or runtime</refpurpose> <refpurpose>Sign an application or runtime</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-sign</command> <command>flatpak build-sign</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
<arg choice="plain">ID</arg> <arg choice="plain">ID</arg>
@ -126,7 +126,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command> <command>$ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
</para> </para>
<programlisting> <programlisting>
Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c
@ -144,9 +144,9 @@ Content Bytes Written: 305
<para> <para>
<citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
</para> </para>
</refsect1> </refsect1>

22
doc/xdg-app-build-update-repo.xml → doc/flatpak-build-update-repo.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build-update-repo"> <refentry id="flatpak-build-update-repo">
<refentryinfo> <refentryinfo>
<title>xdg-app build-update-repo</title> <title>flatpak build-update-repo</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build-update-repo</refentrytitle> <refentrytitle>flatpak build-update-repo</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build-update-repo</refname> <refname>flatpak-build-update-repo</refname>
<refpurpose>Create a repository from a build directory</refpurpose> <refpurpose>Create a repository from a build directory</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build-update-repo</command> <command>flatpak build-update-repo</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
</cmdsynopsis> </cmdsynopsis>
@ -43,12 +43,12 @@
Updates repository metadata for the repository at Updates repository metadata for the repository at
<arg choice="plain">LOCATION</arg>. This command generates <arg choice="plain">LOCATION</arg>. This command generates
an OSTree summary file that lists the contents of the repository. an OSTree summary file that lists the contents of the repository.
The summary is used by xdg-app repo-contents and other commands The summary is used by flatpak repo-contents and other commands
to display the contents of remote repositories. to display the contents of remote repositories.
</para> </para>
<para> <para>
After this command, <arg choice="plain">LOCATION</arg> can be After this command, <arg choice="plain">LOCATION</arg> can be
used as the repository location for xdg-app add-repo, either by used as the repository location for flatpak add-repo, either by
exporting it over http, or directly with a file: url. exporting it over http, or directly with a file: url.
</para> </para>
</refsect1> </refsect1>
@ -142,9 +142,9 @@
<para> <para>
<citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-repo-contents</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-repo-contents</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

24
doc/xdg-app-build.xml → doc/flatpak-build.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-build"> <refentry id="flatpak-build">
<refentryinfo> <refentryinfo>
<title>xdg-app build</title> <title>flatpak build</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app build</refentrytitle> <refentrytitle>flatpak build</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-build</refname> <refname>flatpak-build</refname>
<refpurpose>Build in a directory</refpurpose> <refpurpose>Build in a directory</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app build</command> <command>flatpak build</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
<arg choice="opt">COMMAND <arg choice="opt" rep="repeat">ARG</arg></arg> <arg choice="opt">COMMAND <arg choice="opt" rep="repeat">ARG</arg></arg>
@ -42,7 +42,7 @@
<para> <para>
Runs a build command in a directory. <arg choice="plain">DIRECTORY</arg> Runs a build command in a directory. <arg choice="plain">DIRECTORY</arg>
must have been initialized with <command>xdg-app build-init</command>. must have been initialized with <command>flatpak build-init</command>.
</para> </para>
<para> <para>
The sdk that is specfied in the <filename>metadata</filename> file The sdk that is specfied in the <filename>metadata</filename> file
@ -222,7 +222,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app build /build/my-app rpmbuild my-app.src.rpm</command> <command>$ flatpak build /build/my-app rpmbuild my-app.src.rpm</command>
</para> </para>
</refsect1> </refsect1>
@ -231,10 +231,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

58
doc/xdg-app-builder.xml → doc/flatpak-builder.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-builder"> <refentry id="flatpak-builder">
<refentryinfo> <refentryinfo>
<title>xdg-app builder</title> <title>flatpak builder</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,24 +19,24 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app-builder</refentrytitle> <refentrytitle>flatpak-builder</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-builder</refname> <refname>flatpak-builder</refname>
<refpurpose>Help build application dependencies</refpurpose> <refpurpose>Help build application dependencies</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app-builder</command> <command>flatpak-builder</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
<arg choice="plain">MANIFEST</arg> <arg choice="plain">MANIFEST</arg>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app-builder</command> <command>flatpak-builder</command>
<arg choice="plain">--run</arg> <arg choice="plain">--run</arg>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">DIRECTORY</arg> <arg choice="plain">DIRECTORY</arg>
@ -49,46 +49,46 @@
<title>Description</title> <title>Description</title>
<para> <para>
<command>xdg-app-builder</command> is a wrapper around the <command>xdg-app build</command> command <command>flatpak-builder</command> is a wrapper around the <command>flatpak build</command> command
that automates the building of applications and their dependencies. It is one option you can use that automates the building of applications and their dependencies. It is one option you can use
to build applications. to build applications.
</para> </para>
<para> <para>
The goal of <command>xdg-app-builder</command> is to push as much knowledge about how to build modules to The goal of <command>flatpak-builder</command> is to push as much knowledge about how to build modules to
the individual upstream projects. It does this by assuming that the modules adhere to the Build API specified the individual upstream projects. It does this by assuming that the modules adhere to the Build API specified
at https://github.com/cgwalters/build-api. This essentially means that it follows the <command>./configure at https://github.com/cgwalters/build-api. This essentially means that it follows the <command>./configure
&amp;&amp; make &amp;&amp; make install</command> scheme with an optional autogen script. If the upstream &amp;&amp; make &amp;&amp; make install</command> scheme with an optional autogen script. If the upstream
does not adhere to the API you can make it do so by adding patches and extra files. does not adhere to the API you can make it do so by adding patches and extra files.
</para> </para>
<para> <para>
An invocation of <command>xdg-app-builder</command> proceeds in these stages, each being specified An invocation of <command>flatpak-builder</command> proceeds in these stages, each being specified
in detail in json format in <arg choice="plain">MANIFEST</arg>: in detail in json format in <arg choice="plain">MANIFEST</arg>:
<itemizedlist mark='bullet'> <itemizedlist mark='bullet'>
<listitem> <listitem>
<para>Download all sources</para> <para>Download all sources</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Initialize the application directory with <command>xdg-app build-init</command></para> <para>Initialize the application directory with <command>flatpak build-init</command></para>
</listitem> </listitem>
<listitem> <listitem>
<para>Build and install each module with <command>xdg-app build</command></para> <para>Build and install each module with <command>flatpak build</command></para>
</listitem> </listitem>
<listitem> <listitem>
<para>Clean up the final build tree by removing unwanted files and e.g. stripping binaries</para> <para>Clean up the final build tree by removing unwanted files and e.g. stripping binaries</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Finish the application directory with <command>xdg-app build-finish</command></para> <para>Finish the application directory with <command>flatpak build-finish</command></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
After this you will end up with a build of the application in <arg choice="plain">DIRECTORY</arg>, which you can After this you will end up with a build of the application in <arg choice="plain">DIRECTORY</arg>, which you can
export to a repository with the <command>xdg-app build-export</command> command. export to a repository with the <command>flatpak build-export</command> command.
</para> </para>
<para> <para>
At each of the above steps xdg-app caches the result, and if you build the same file again, it will start At each of the above steps flatpak caches the result, and if you build the same file again, it will start
of at the first step where something changes. For instance the first version controlled source that had of at the first step where something changes. For instance the first version controlled source that had
new commits added, or the first module where some changes to the <arg choice="plain">MANIFEST</arg> file caused new commits added, or the first module where some changes to the <arg choice="plain">MANIFEST</arg> file caused
the build environment to change. This makes xdg-app-builder very efficient for incremental builds. the build environment to change. This makes flatpak-builder very efficient for incremental builds.
</para> </para>
</refsect1> </refsect1>
@ -196,7 +196,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>finish-args</option> (array of strings)</term> <term><option>finish-args</option> (array of strings)</term>
<listitem><para>An array of arguments passed to the <command>xdg-app build-finish</command> command.</para></listitem> <listitem><para>An array of arguments passed to the <command>flatpak build-finish</command> command.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>rename-desktop-file</option> (string)</term> <term><option>rename-desktop-file</option> (string)</term>
@ -254,7 +254,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>build-args</option> (array of strings)</term> <term><option>build-args</option> (array of strings)</term>
<listitem><para>This is an array containing extra options to pass to xdg-app build.</para></listitem> <listitem><para>This is an array containing extra options to pass to flatpak build.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>strip</option> (boolean)</term> <term><option>strip</option> (boolean)</term>
@ -588,10 +588,10 @@
<term><option>--run</option></term> <term><option>--run</option></term>
<listitem><para> <listitem><para>
Run a command in a sandbox based on the build dir. This starts xdg-app build, with some extra Run a command in a sandbox based on the build dir. This starts flatpak build, with some extra
arguments to give the same environment as the build, and the same permissions the final app arguments to give the same environment as the build, and the same permissions the final app
will have. The command to run must be the last argument passed to will have. The command to run must be the last argument passed to
xdg-app-builder, after the directory and the manifest. flatpak-builder, after the directory and the manifest.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
@ -701,14 +701,14 @@
<title>Caching</title> <title>Caching</title>
<para> <para>
xdg-app-builder caches sources and partial build results in flatpak-builder caches sources and partial build results in
the .xdg-app-builder subdirectory of the current directory. If you the .flatpak-builder subdirectory of the current directory. If you
use <option>--keep-build-dirs</option>, build directories for each use <option>--keep-build-dirs</option>, build directories for each
module are also stored here. module are also stored here.
</para> </para>
<para> <para>
It is safe to remove the contents of the .xdg-app-builder It is safe to remove the contents of the .flatpak-builder
directory. This will force a full build the next time you build. directory. This will force a full build the next time you build.
</para> </para>
@ -718,7 +718,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app-builder my-app-dir manifest.json</command> <command>$ flatpak-builder my-app-dir manifest.json</command>
</para> </para>
<para> <para>
@ -795,11 +795,11 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

18
doc/xdg-app-enter.xml → doc/flatpak-enter.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-enter"> <refentry id="flatpak-enter">
<refentryinfo> <refentryinfo>
<title>xdg-app enter</title> <title>flatpak enter</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app enter</refentrytitle> <refentrytitle>flatpak enter</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-enter</refname> <refname>flatpak-enter</refname>
<refpurpose>Enter an application</refpurpose> <refpurpose>Enter an application</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app enter</command> <command>flatpak enter</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">MONITORPID</arg> <arg choice="plain">MONITORPID</arg>
<arg choice="plain">COMMAND</arg> <arg choice="plain">COMMAND</arg>
@ -92,7 +92,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app enter 15345 sh</command> <command>$ flatpak enter 15345 sh</command>
</para> </para>
</refsect1> </refsect1>
@ -101,8 +101,8 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

18
doc/xdg-app-export-file.xml → doc/flatpak-export-file.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-export-file"> <refentry id="flatpak-export-file">
<refentryinfo> <refentryinfo>
<title>xdg-app export-file</title> <title>flatpak export-file</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app export-file</refentrytitle> <refentrytitle>flatpak export-file</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-export-file</refname> <refname>flatpak-export-file</refname>
<refpurpose>Export a file to a sandboxed application</refpurpose> <refpurpose>Export a file to a sandboxed application</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app export-file</command> <command>flatpak export-file</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">FILE</arg> <arg choice="plain">FILE</arg>
</cmdsynopsis> </cmdsynopsis>
@ -141,7 +141,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app export-file --app=org.gnome.GEdit ~/test.txt</command> <command>$ flatpak export-file --app=org.gnome.GEdit ~/test.txt</command>
</para> </para>
<programlisting> <programlisting>
/run/user/1000/doc/e52f9c6a/test.txt /run/user/1000/doc/e52f9c6a/test.txt
@ -153,8 +153,8 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-info.xml → doc/flatpak-info.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-info"> <refentry id="flatpak-info">
<refentryinfo> <refentryinfo>
<title>xdg-app info</title> <title>flatpak info</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app info</refentrytitle> <refentrytitle>flatpak info</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-info</refname> <refname>flatpak-info</refname>
<refpurpose>Show information about installed application and/or runtime</refpurpose> <refpurpose>Show information about installed application and/or runtime</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app info</command> <command>flatpak info</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
<arg choice="opt">BRANCH</arg> <arg choice="opt">BRANCH</arg>
@ -152,7 +152,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user list</command> <command>$ flatpak --user list</command>
</para> </para>
<programlisting> <programlisting>
org.gnome.Builder org.gnome.Builder
@ -167,9 +167,9 @@ org.gnome.GEdit
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

28
doc/xdg-app-install.xml → doc/flatpak-install.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-install"> <refentry id="flatpak-install">
<refentryinfo> <refentryinfo>
<title>xdg-app install</title> <title>flatpak install</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,25 +19,25 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app install</refentrytitle> <refentrytitle>flatpak install</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-install</refname> <refname>flatpak-install</refname>
<refpurpose>Install an application or runtime</refpurpose> <refpurpose>Install an application or runtime</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app install</command> <command>flatpak install</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">REMOTE</arg> <arg choice="plain">REMOTE</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
<arg choice="opt">BRANCH</arg> <arg choice="opt">BRANCH</arg>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app install</command> <command>flatpak install</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">--bundle</arg> <arg choice="plain">--bundle</arg>
<arg choice="plain">FILENAME</arg> <arg choice="plain">FILENAME</arg>
@ -58,7 +58,7 @@
the specified <arg choice="plain">REMOTE</arg>, but you can limit this by using the --app or --runtime option. the specified <arg choice="plain">REMOTE</arg>, but you can limit this by using the --app or --runtime option.
</para> </para>
<para> <para>
Note that xdg-app allows to have multiple branches of an application and runtimes Note that flatpak allows to have multiple branches of an application and runtimes
installed and used at the same time. However, only version of an application one can be current, installed and used at the same time. However, only version of an application one can be current,
meaning its exported files (for instance desktop files and icons) are meaning its exported files (for instance desktop files and icons) are
visible to the host. The last installed version is made current by visible to the host. The last installed version is made current by
@ -71,7 +71,7 @@
<para> <para>
The alternative form of the command installs an application from a The alternative form of the command installs an application from a
single-file bundle instead of a configured remote. Such bundles can single-file bundle instead of a configured remote. Such bundles can
be created with the xdg-app build-bundle command. be created with the flatpak build-bundle command.
</para> </para>
</refsect1> </refsect1>
@ -195,7 +195,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user install test-repo org.gnome.GEdit</command> <command>$ flatpak --user install test-repo org.gnome.GEdit</command>
</para> </para>
</refsect1> </refsect1>
@ -204,10 +204,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-list.xml → doc/flatpak-list.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-list"> <refentry id="flatpak-list">
<refentryinfo> <refentryinfo>
<title>xdg-app list</title> <title>flatpak list</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app list</refentrytitle> <refentrytitle>flatpak list</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-list</refname> <refname>flatpak-list</refname>
<refpurpose>List installed applications and/or runtimes</refpurpose> <refpurpose>List installed applications and/or runtimes</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app list</command> <command>flatpak list</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
</cmdsynopsis> </cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
@ -130,7 +130,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user list</command> <command>$ flatpak --user list</command>
</para> </para>
<programlisting> <programlisting>
org.gnome.Builder org.gnome.Builder
@ -145,9 +145,9 @@ org.gnome.GEdit
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-make-current.xml → doc/flatpak-make-current.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-make-current"> <refentry id="flatpak-make-current">
<refentryinfo> <refentryinfo>
<title>xdg-app make-current</title> <title>flatpak make-current</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app make-current</refentrytitle> <refentrytitle>flatpak make-current</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-make-current</refname> <refname>flatpak-make-current</refname>
<refpurpose>Make a specific version of an app current</refpurpose> <refpurpose>Make a specific version of an app current</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app make-current</command> <command>flatpak make-current</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">APP</arg> <arg choice="plain">APP</arg>
<arg choice="plain">BRANCH</arg> <arg choice="plain">BRANCH</arg>
@ -118,7 +118,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user make-current org.gnome.GEdit 3.14</command> <command>$ flatpak --user make-current org.gnome.GEdit 3.14</command>
</para> </para>
</refsect1> </refsect1>
@ -127,9 +127,9 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

22
doc/xdg-app-override.xml → doc/flatpak-override.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-override"> <refentry id="flatpak-override">
<refentryinfo> <refentryinfo>
<title>xdg-app override</title> <title>flatpak override</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app override</refentrytitle> <refentrytitle>flatpak override</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-override</refname> <refname>flatpak-override</refname>
<refpurpose>Override application requirements</refpurpose> <refpurpose>Override application requirements</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app override</command> <command>flatpak override</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">APP</arg> <arg choice="plain">APP</arg>
</cmdsynopsis> </cmdsynopsis>
@ -47,7 +47,7 @@
By default the application gets access to the resources it By default the application gets access to the resources it
requested when it is started. But the user can override it requested when it is started. But the user can override it
on a particular instance by specifying extra arguments to on a particular instance by specifying extra arguments to
xdg-app run, or every time by using xdg-app override. flatpak run, or every time by using flatpak override.
</para> </para>
</refsect1> </refsect1>
@ -212,10 +212,10 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app override --nosocket=wayland org.gnome.GEdit</command> <command>$ flatpak override --nosocket=wayland org.gnome.GEdit</command>
</para> </para>
<para> <para>
<command>$ xdg-app override --filesystem=home org.mozilla.Firefox</command> <command>$ flatpak override --filesystem=home org.mozilla.Firefox</command>
</para> </para>
</refsect1> </refsect1>
@ -224,8 +224,8 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

24
doc/xdg-app-remote-add.xml → doc/flatpak-remote-add.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-remote-add"> <refentry id="flatpak-remote-add">
<refentryinfo> <refentryinfo>
<title>xdg-app remote-add</title> <title>flatpak remote-add</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app remote-add</refentrytitle> <refentrytitle>flatpak remote-add</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-remote-add</refname> <refname>flatpak-remote-add</refname>
<refpurpose>Add a remote repository</refpurpose> <refpurpose>Add a remote repository</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app remote-add</command> <command>flatpak remote-add</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
<arg choice="plain">LOCATION</arg> <arg choice="plain">LOCATION</arg>
@ -41,7 +41,7 @@
<title>Description</title> <title>Description</title>
<para> <para>
Adds a remote repository to the xdg-app repository configuration. Adds a remote repository to the flatpak repository configuration.
<arg choice="plain">NAME</arg> is the name for the new remote, and <arg choice="plain">NAME</arg> is the name for the new remote, and
<arg choice="plain">LOCATION</arg> is the url or pathname for the repository. <arg choice="plain">LOCATION</arg> is the url or pathname for the repository.
</para> </para>
@ -177,7 +177,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command> <command>$ flatpak --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command>
</para> </para>
</refsect1> </refsect1>
@ -185,10 +185,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

24
doc/xdg-app-remote-delete.xml → doc/flatpak-remote-delete.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-remote-delete"> <refentry id="flatpak-remote-delete">
<refentryinfo> <refentryinfo>
<title>xdg-app remote-delete</title> <title>flatpak remote-delete</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app remote-delete</refentrytitle> <refentrytitle>flatpak remote-delete</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-remote-delete</refname> <refname>flatpak-remote-delete</refname>
<refpurpose>Delete a remote repository</refpurpose> <refpurpose>Delete a remote repository</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app remote-delete</command> <command>flatpak remote-delete</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
</cmdsynopsis> </cmdsynopsis>
@ -40,7 +40,7 @@
<title>Description</title> <title>Description</title>
<para> <para>
Removes a remote repository from the xdg-app repository configuration. Removes a remote repository from the flatpak repository configuration.
<arg choice="plain">NAME</arg> is the name of an existing remote. <arg choice="plain">NAME</arg> is the name of an existing remote.
</para> </para>
<para> <para>
@ -104,7 +104,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user remote-delete dried-raisins</command> <command>$ flatpak --user remote-delete dried-raisins</command>
</para> </para>
</refsect1> </refsect1>
@ -112,10 +112,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-remote-list.xml → doc/flatpak-remote-list.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-remote-list"> <refentry id="flatpak-remote-list">
<refentryinfo> <refentryinfo>
<title>xdg-app remote-list</title> <title>flatpak remote-list</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app remote-list</refentrytitle> <refentrytitle>flatpak remote-list</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-remote-list</refname> <refname>flatpak-remote-list</refname>
<refpurpose>List remote repositories</refpurpose> <refpurpose>List remote repositories</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app remote-list</command> <command>flatpak remote-list</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
</cmdsynopsis> </cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
@ -119,7 +119,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app remote-list --user --show-details</command> <command>$ flatpak remote-list --user --show-details</command>
</para> </para>
<programlisting> <programlisting>
testrepo Test Repository http://209.132.179.91/repo/ no-gpg-verify testrepo Test Repository http://209.132.179.91/repo/ no-gpg-verify
@ -130,9 +130,9 @@ testrepo Test Repository http://209.132.179.91/repo/ no-gpg-verify
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

16
doc/xdg-app-remote-ls.xml → doc/flatpak-remote-ls.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-remote-ls"> <refentry id="flatpak-remote-ls">
<refentryinfo> <refentryinfo>
<title>xdg-app remote-ls</title> <title>flatpak remote-ls</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app remote-ls</refentrytitle> <refentrytitle>flatpak remote-ls</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-remote-ls</refname> <refname>flatpak-remote-ls</refname>
<refpurpose>Show available runtimes and applications</refpurpose> <refpurpose>Show available runtimes and applications</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app remote-ls</command> <command>flatpak remote-ls</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">REMOTE</arg> <arg choice="plain">REMOTE</arg>
</cmdsynopsis> </cmdsynopsis>
@ -42,7 +42,7 @@
<para> <para>
Shows runtimes and applications that are available in the Shows runtimes and applications that are available in the
remote repository with the name <arg choice="plain">REMOTE</arg>. remote repository with the name <arg choice="plain">REMOTE</arg>.
You can find all configured remote repositories with xdg-app list-repos. You can find all configured remote repositories with flatpak list-repos.
</para> </para>
<para> <para>
Unless overridden with the --user option, this command uses Unless overridden with the --user option, this command uses
@ -138,7 +138,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user remote-ls --only-apps testrepo</command> <command>$ flatpak --user remote-ls --only-apps testrepo</command>
</para> </para>
<programlisting> <programlisting>
org.gnome.Builder org.gnome.Builder

24
doc/xdg-app-remote-modify.xml → doc/flatpak-remote-modify.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-remote-modify"> <refentry id="flatpak-remote-modify">
<refentryinfo> <refentryinfo>
<title>xdg-app remote-modify</title> <title>flatpak remote-modify</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app remote-modify</refentrytitle> <refentrytitle>flatpak remote-modify</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-remote-modify</refname> <refname>flatpak-remote-modify</refname>
<refpurpose>Modify a remote repository</refpurpose> <refpurpose>Modify a remote repository</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app remote-modify</command> <command>flatpak remote-modify</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
</cmdsynopsis> </cmdsynopsis>
@ -40,7 +40,7 @@
<title>Description</title> <title>Description</title>
<para> <para>
Modifies options for an existing remote repository in the xdg-app repository configuration. Modifies options for an existing remote repository in the flatpak repository configuration.
<arg choice="plain">NAME</arg> is the name for the remote. <arg choice="plain">NAME</arg> is the name for the remote.
</para> </para>
<para> <para>
@ -193,7 +193,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user remote-modify --no-gpg-verify test-repo</command> <command>$ flatpak --user remote-modify --no-gpg-verify test-repo</command>
</para> </para>
</refsect1> </refsect1>
@ -201,10 +201,10 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

24
doc/xdg-app-run.xml → doc/flatpak-run.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-run"> <refentry id="flatpak-run">
<refentryinfo> <refentryinfo>
<title>xdg-app run</title> <title>flatpak run</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app run</refentrytitle> <refentrytitle>flatpak run</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-run</refname> <refname>flatpak-run</refname>
<refpurpose>Run an application</refpurpose> <refpurpose>Run an application</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app run</command> <command>flatpak run</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">APP</arg> <arg choice="plain">APP</arg>
<arg choice="opt" rep="repeat">ARG</arg> <arg choice="opt" rep="repeat">ARG</arg>
@ -46,7 +46,7 @@
Extra arguments are passed on to the application. Extra arguments are passed on to the application.
</para> </para>
<para> <para>
xdg-app creates a sandboxed environment for the application to run in flatpak creates a sandboxed environment for the application to run in
by mounting the right runtime at <filename>/usr</filename> and a writable by mounting the right runtime at <filename>/usr</filename> and a writable
directory at <filename>/var</filename>, whose content is preserved between directory at <filename>/var</filename>, whose content is preserved between
application runs. The application itself is mounted at <filename>/app</filename>. application runs. The application itself is mounted at <filename>/app</filename>.
@ -315,10 +315,10 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app run org.gnome.GEdit</command> <command>$ flatpak run org.gnome.GEdit</command>
</para> </para>
<para> <para>
<command>$ xdg-app run --devel --command=bash org.gnome.Builder</command> <command>$ flatpak run --devel --command=bash org.gnome.Builder</command>
</para> </para>
</refsect1> </refsect1>
@ -327,9 +327,9 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-override</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-override</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>xdg-app-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

12
doc/xdg-app-uninstall.xml → doc/flatpak-uninstall.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-uninstall"> <refentry id="flatpak-uninstall">
<refentryinfo> <refentryinfo>
<title>dxg-app uninstall</title> <title>dxg-app uninstall</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app uninstall</refentrytitle> <refentrytitle>flatpak uninstall</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-uninstall</refname> <refname>flatpak-uninstall</refname>
<refpurpose>Uninstall an application or runtime</refpurpose> <refpurpose>Uninstall an application or runtime</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app uninstall</command> <command>flatpak uninstall</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="plain">NAME</arg> <arg choice="plain">NAME</arg>
<arg choice="opt">BRANCH</arg> <arg choice="opt">BRANCH</arg>
@ -158,7 +158,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user uninstall org.gnome.GEdit</command> <command>$ flatpak --user uninstall org.gnome.GEdit</command>
</para> </para>
</refsect1> </refsect1>

20
doc/xdg-app-update.xml → doc/flatpak-update.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app-update"> <refentry id="flatpak-update">
<refentryinfo> <refentryinfo>
<title>xdg-app update</title> <title>flatpak update</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app update</refentrytitle> <refentrytitle>flatpak update</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app-update</refname> <refname>flatpak-update</refname>
<refpurpose>Update a runtime</refpurpose> <refpurpose>Update a runtime</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app update</command> <command>flatpak update</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="opt">NAME</arg> <arg choice="opt">NAME</arg>
<arg choice="opt">BRANCH</arg> <arg choice="opt">BRANCH</arg>
@ -184,7 +184,7 @@
<title>Examples</title> <title>Examples</title>
<para> <para>
<command>$ xdg-app --user update org.gnome.GEdit</command> <command>$ flatpak --user update org.gnome.GEdit</command>
</para> </para>
</refsect1> </refsect1>
@ -193,9 +193,9 @@
<title>See also</title> <title>See also</title>
<para> <para>
<citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

68
doc/xdg-app.xml → doc/flatpak.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="xdg-app"> <refentry id="flatpak">
<refentryinfo> <refentryinfo>
<title>xdg-app</title> <title>flatpak</title>
<productname>xdg-app</productname> <productname>flatpak</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -19,18 +19,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>xdg-app</refentrytitle> <refentrytitle>flatpak</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>xdg-app</refname> <refname>flatpak</refname>
<refpurpose>Build, install and run applications and runtimes</refpurpose> <refpurpose>Build, install and run applications and runtimes</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>xdg-app</command> <command>flatpak</command>
<arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="req">COMMAND</arg> <arg choice="req">COMMAND</arg>
</cmdsynopsis> </cmdsynopsis>
@ -40,18 +40,18 @@
<title>Description</title> <title>Description</title>
<para> <para>
xdg-app is a tool for managing applications and the runtimes flatpak is a tool for managing applications and the runtimes
they use. In the xdg-app model, applications can be built and they use. In the flatpak model, applications can be built and
distributed independently from the host system they are used distributed independently from the host system they are used
on, and they are isolated from the host system ('sandboxed') on, and they are isolated from the host system ('sandboxed')
to some degree, at runtime. to some degree, at runtime.
</para> </para>
<para> <para>
xdg-app can operate in system-wide or per-user mode. The system-wide flatpak can operate in system-wide or per-user mode. The system-wide
data (runtimes, applications and configuration) is located in data (runtimes, applications and configuration) is located in
<filename>$prefix/share/xdg-app/</filename>, and the per-user <filename>$prefix/share/flatpak/</filename>, and the per-user
data is in <filename>$HOME/.local/share/xdg-app/</filename>. data is in <filename>$HOME/.local/share/flatpak/</filename>.
Below these locations, there is a local repository in the Below these locations, there is a local repository in the
<filename>repo/</filename> subdirectory and installed runtimes <filename>repo/</filename> subdirectory and installed runtimes
and applications are in the corresponding <filename>runtime/</filename> and applications are in the corresponding <filename>runtime/</filename>
@ -59,7 +59,7 @@
</para> </para>
<para> <para>
xdg-app uses OSTree to distribute and deploy data. The repositories flatpak uses OSTree to distribute and deploy data. The repositories
it uses are OSTree repositories and can be manipulated with the it uses are OSTree repositories and can be manipulated with the
<command>ostree</command> utility. Installed runtimes and <command>ostree</command> utility. Installed runtimes and
applications are OSTree checkouts. applications are OSTree checkouts.
@ -107,35 +107,35 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-install</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-install</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Install an application or a runtime from a remote or bundle. Install an application or a runtime from a remote or bundle.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-update</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-update</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Update an installed application or runtime. Update an installed application or runtime.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-uninstall</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-uninstall</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Uninstall an installed application or runtime. Uninstall an installed application or runtime.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
List installed applications and/or runtimes. List installed applications and/or runtimes.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-info</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-info</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Show information for an installed application or runtime. Show information for an installed application or runtime.
@ -148,28 +148,28 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Run an application. Run an application.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-override</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-override</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Override permissions for an application. Override permissions for an application.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-export-file</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-export-file</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Grant an application access to a specific file. Grant an application access to a specific file.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Enter the namespace of a running application. Enter the namespace of a running application.
@ -181,35 +181,35 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Add a new remote repository. Add a new remote repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-remote-modify</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-remote-modify</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Modify properties of a configured remote repository. Modify properties of a configured remote repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-remote-delete</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-remote-delete</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Delete a configured remote repository. Delete a configured remote repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
List all configured remote repositories. List all configured remote repositories.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-remote-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-remote-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
List contents of a configured remote repository. List contents of a configured remote repository.
@ -221,56 +221,56 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Initialize a build directory. Initialize a build directory.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Run a build command in a build directory. Run a build command in a build directory.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Finalizes a build directory for export. Finalizes a build directory for export.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Export a build directory to a repository. Export a build directory to a repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Create a bundle file from a build directory. Create a bundle file from a build directory.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Import a file bundle into a local repository. Import a file bundle into a local repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-update-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-update-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Update the summary file in a repository. Update the summary file in a repository.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><citerefentry><refentrytitle>xdg-app-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry></term> <term><citerefentry><refentrytitle>flatpak-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
<listitem><para> <listitem><para>
Sign an application or runtime after its been exported. Sign an application or runtime after its been exported.

24
doc/reference/.gitignore vendored
View File

@ -2,15 +2,15 @@ html/
xml/ xml/
*.stamp *.stamp
*.bak *.bak
xdg-app-decl-list.txt flatpak-decl-list.txt
xdg-app-decl.txt flatpak-decl.txt
xdg-app-overrides.txt flatpak-overrides.txt
xdg-app-undeclared.txt flatpak-undeclared.txt
xdg-app-undocumented.txt flatpak-undocumented.txt
xdg-app-unused.txt flatpak-unused.txt
xdg-app.args flatpak.args
xdg-app.hierarchy flatpak.hierarchy
xdg-app.interfaces flatpak.interfaces
xdg-app.prerequisites flatpak.prerequisites
xdg-app.signals flatpak.signals
xdg-app.types flatpak.types

2
doc/reference/version.xml.in
View File

@ -1 +1 @@
@XDG_APP_MAJOR_VERSION@.@XDG_APP_MINOR_VERSION@.@XDG_APP_MICRO_VERSION@ @FLATPAK_MAJOR_VERSION@.@FLATPAK_MINOR_VERSION@.@FLATPAK_MICRO_VERSION@

2
document-portal/xdg-document-portal.service.in
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=xdg-app document portal service Description=flatpak document portal service
[Service] [Service]
BusName=org.freedesktop.portal.Documents BusName=org.freedesktop.portal.Documents

10
document-portal/xdp-main.c
View File

@ -36,7 +36,7 @@ typedef struct
static GMainLoop *loop = NULL; static GMainLoop *loop = NULL;
static FlatpakDb *db = NULL; static FlatpakDb *db = NULL;
static XdgAppPermissionStore *permission_store; static FlatpakPermissionStore *permission_store;
static int daemon_event_fd = -1; static int daemon_event_fd = -1;
static int final_exit_status = 0; static int final_exit_status = 0;
static dev_t fuse_dev = 0; static dev_t fuse_dev = 0;
@ -89,7 +89,7 @@ do_set_permissions (FlatpakDbEntry *entry,
if (persist_entry (new_entry)) if (persist_entry (new_entry))
{ {
xdg_app_permission_store_call_set_permission (permission_store, flatpak_permission_store_call_set_permission (permission_store,
TABLE_NAME, TABLE_NAME,
FALSE, FALSE,
doc_id, doc_id,
@ -243,7 +243,7 @@ portal_delete (GDBusMethodInvocation *invocation,
flatpak_db_set_entry (db, id, NULL); flatpak_db_set_entry (db, id, NULL);
if (persist_entry (entry)) if (persist_entry (entry))
xdg_app_permission_store_call_delete (permission_store, TABLE_NAME, flatpak_permission_store_call_delete (permission_store, TABLE_NAME,
id, NULL, NULL, NULL); id, NULL, NULL, NULL);
} }
@ -303,7 +303,7 @@ do_create_doc (struct stat *parent_st_buf, const char *path, gboolean reuse_exis
if (persistent) if (persistent)
{ {
xdg_app_permission_store_call_set (permission_store, flatpak_permission_store_call_set (permission_store,
TABLE_NAME, TABLE_NAME,
TRUE, TRUE,
id, id,
@ -821,7 +821,7 @@ main (int argc,
do_exit (3); do_exit (3);
} }
permission_store = xdg_app_permission_store_proxy_new_sync (session_bus, G_DBUS_PROXY_FLAGS_NONE, permission_store = flatpak_permission_store_proxy_new_sync (session_bus, G_DBUS_PROXY_FLAGS_NONE,
"org.freedesktop.Flatpak", "org.freedesktop.Flatpak",
"/org/freedesktop/Flatpak/PermissionStore", "/org/freedesktop/Flatpak/PermissionStore",
NULL, &error); NULL, &error);

0
env.d/xdg-app.env.in → env.d/flatpak.env.in
View File

6
lib/flatpak-error.c
View File

@ -1,4 +1,4 @@
/* xdg-app-error.c /* flatpak-error.c
* *
* Copyright (C) 2015 Red Hat, Inc * Copyright (C) 2015 Red Hat, Inc
* *
@ -26,9 +26,9 @@
#include <gio/gio.h> #include <gio/gio.h>
/** /**
* SECTION:xdg-app-error * SECTION:flatpak-error
* @Title: Error codes * @Title: Error codes
* *
*/ */
G_DEFINE_QUARK (xdg - app - error - quark, flatpak_error) G_DEFINE_QUARK (flatpak-error-quark, flatpak_error)

2
lib/flatpak-error.h
View File

@ -1,4 +1,4 @@
/* xdg-app-error.c /* flatpak-error.c
* *
* Copyright (C) 2015 Red Hat, Inc * Copyright (C) 2015 Red Hat, Inc
* *

16
lib/flatpak-installation.c
View File

@ -34,15 +34,15 @@
#include "flatpak-error.h" #include "flatpak-error.h"
/** /**
* SECTION:xdg-app-installation * SECTION:flatpak-installation
* @Title: FlatpakInstallation * @Title: FlatpakInstallation
* @Short_description: Installation information * @Short_description: Installation information
* *
* FlatpakInstallation is the toplevel object that software installers * FlatpakInstallation is the toplevel object that software installers
* should use to operate on an xdg-apps. * should use to operate on an flatpak applications.
* *
* An FlatpakInstallation object provides information about an installation * An FlatpakInstallation object provides information about an installation
* location for xdg-app applications. Typical installation locations are either * location for flatpak applications. Typical installation locations are either
* system-wide (in /var/lib/xdg-app) or per-user (in ~/.local/share/xdg-app). * system-wide (in /var/lib/xdg-app) or per-user (in ~/.local/share/xdg-app).
* *
* FlatpakInstallation can list configured remotes as well as installed application * FlatpakInstallation can list configured remotes as well as installed application
@ -804,14 +804,14 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
/** /**
* flatpak_installation_install_bundle: * flatpak_installation_install_bundle:
* @self: a #FlatpakInstallation * @self: a #FlatpakInstallation
* @file: a #GFile that is an xdg-app bundle * @file: a #GFile that is an flatpak bundle
* @progress: (scope call): progress callback * @progress: (scope call): progress callback
* @progress_data: user data passed to @progress * @progress_data: user data passed to @progress
* @cancellable: (nullable): a #GCancellable * @cancellable: (nullable): a #GCancellable
* @error: return location for a #GError * @error: return location for a #GError
* *
* Install an application or runtime from an xdg-app bundle file. * Install an application or runtime from an flatpak bundle file.
* See xdg-app-build-bundle(1) for how to create brundles. * See flatpak-build-bundle(1) for how to create brundles.
* *
* Returns: (transfer full): The ref for the newly installed app or %NULL on failure * Returns: (transfer full): The ref for the newly installed app or %NULL on failure
*/ */
@ -1273,7 +1273,7 @@ flatpak_installation_fetch_remote_size_sync2 (FlatpakInstallation *self,
* *
* This is deprecated, use flatpak_installation_fetch_remote_metadata_sync2 * This is deprecated, use flatpak_installation_fetch_remote_metadata_sync2
* *
* Returns: (transfer full): a #GBytes containing the xdg-app metadata file, * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
* or %NULL if an error occurred * or %NULL if an error occurred
*/ */
GBytes * GBytes *
@ -1308,7 +1308,7 @@ flatpak_installation_fetch_remote_metadata_sync (FlatpakInstallation *self,
* *
* Obtains the metadata file from a commit. * Obtains the metadata file from a commit.
* *
* Returns: (transfer full): a #GBytes containing the xdg-app metadata file, * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
* or %NULL if an error occurred * or %NULL if an error occurred
*/ */
GBytes * GBytes *

2
lib/flatpak-installed-ref.c
View File

@ -27,7 +27,7 @@
#include "flatpak-enum-types.h" #include "flatpak-enum-types.h"
/** /**
* SECTION:xdg-app-installed-ref * SECTION:flatpak-installed-ref
* @Title: FlatpakInstalledRef * @Title: FlatpakInstalledRef
* @Short_description: Installed application reference * @Short_description: Installed application reference
* *

4
lib/flatpak-ref.c
View File

@ -25,11 +25,11 @@
#include "flatpak-enum-types.h" #include "flatpak-enum-types.h"
/** /**
* SECTION:xdg-app-ref * SECTION:flatpak-ref
* @Title: FlatpakRef * @Title: FlatpakRef
* @Short_description: Application reference * @Short_description: Application reference
* *
* Currently xdg-app manages two types of binary artifacts: applications, and * Currently flatpak manages two types of binary artifacts: applications, and
* runtimes. Applications contain a program that desktop users can run, while * runtimes. Applications contain a program that desktop users can run, while
* runtimes contain only libraries and data. An FlatpakRef object (or short: ref) * runtimes contain only libraries and data. An FlatpakRef object (or short: ref)
* can refer to either of these. * can refer to either of these.

2
lib/flatpak-remote-ref.c
View File

@ -28,7 +28,7 @@
#include "flatpak-enum-types.h" #include "flatpak-enum-types.h"
/** /**
* SECTION:xdg-app-remote-ref * SECTION:flatpak-remote-ref
* @Title: FlatpakRemoteRef * @Title: FlatpakRemoteRef
* @Short_description: Remote application reference * @Short_description: Remote application reference
* *

2
lib/flatpak-remote.c
View File

@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
/** /**
* SECTION:xdg-app-remote * SECTION:flatpak-remote
* @Short_description: Remote repository * @Short_description: Remote repository
* @Title: FlatpakRemote * @Title: FlatpakRemote
* *

2
lib/flatpak-version-macros.h.in
View File

@ -34,7 +34,7 @@
#endif #endif
/** /**
* SECTION:xdg-app-version-macros * SECTION:flatpak-version-macros
* @Title: Version information * @Title: Version information
*/ */

2
lib/test-lib.c
View File

@ -92,7 +92,7 @@ main (int argc, char *argv[])
g_print ("\n**** Loading bundle\n"); g_print ("\n**** Loading bundle\n");
{ {
g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.xdgapp"); g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.pak");
g_autoptr(FlatpakBundleRef) bundle = flatpak_bundle_ref_new (f, &error); g_autoptr(FlatpakBundleRef) bundle = flatpak_bundle_ref_new (f, &error);
if (bundle == NULL) if (bundle == NULL)
{ {

2
po/POTFILES.in
View File

@ -1 +1 @@
system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.Flatpak.policy.in

2
profile/xdg-app.sh.in → profile/flatpak.sh.in
View File

@ -1,4 +1,4 @@
# @sysconfdir@/profile.d/xdg-app.sh - set XDG_DATA_DIRS # @sysconfdir@/profile.d/flatpak.sh - set XDG_DATA_DIRS
XDG_DATA_DIRS="${XDG_DATA_DIRS:-$HOME/.local/share/xdg-app/exports/share:@localstatedir@/xdg-app/exports/share/:/usr/local/share/:/usr/share/}" XDG_DATA_DIRS="${XDG_DATA_DIRS:-$HOME/.local/share/xdg-app/exports/share:@localstatedir@/xdg-app/exports/share/:/usr/local/share/:/usr/share/}"
export XDG_DATA_DIRS export XDG_DATA_DIRS

16
session-helper/Makefile.am.inc
View File

@ -1,18 +1,18 @@
libexec_PROGRAMS += \ libexec_PROGRAMS += \
xdg-app-session-helper \ flatpak-session-helper \
$(NULL) $(NULL)
service_in_files += session-helper/xdg-app-session-helper.service.in service_in_files += session-helper/flatpak-session-helper.service.in
systemduserunit_DATA += session-helper/xdg-app-session-helper.service systemduserunit_DATA += session-helper/flatpak-session-helper.service
service_in_files += session-helper/org.freedesktop.XdgApp.service.in service_in_files += session-helper/org.freedesktop.Flatpak.service.in
dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service dbus_service_DATA += session-helper/org.freedesktop.Flatpak.service
xdg_app_session_helper_SOURCES = \ flatpak_session_helper_SOURCES = \
session-helper/flatpak-session-helper.c \ session-helper/flatpak-session-helper.c \
session-helper/flatpak-permission-store.c \ session-helper/flatpak-permission-store.c \
session-helper/flatpak-permission-store.h \ session-helper/flatpak-permission-store.h \
$(NULL) $(NULL)
xdg_app_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS) flatpak_session_helper_CFLAGS = $(BASE_CFLAGS)

90
session-helper/flatpak-permission-store.c
View File

@ -144,9 +144,9 @@ ensure_writeout (Table *table,
} }
static gboolean static gboolean
handle_list (XdgAppPermissionStore *object, handle_list (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name) const gchar *table_name)
{ {
Table *table; Table *table;
@ -158,7 +158,7 @@ handle_list (XdgAppPermissionStore *object,
ids = flatpak_db_list_ids (table->db); ids = flatpak_db_list_ids (table->db);
xdg_app_permission_store_complete_list (object, invocation, (const char * const *) ids); flatpak_permission_store_complete_list (object, invocation, (const char * const *) ids);
return TRUE; return TRUE;
} }
@ -186,10 +186,10 @@ get_app_permissions (FlatpakDbEntry *entry)
} }
static gboolean static gboolean
handle_lookup (XdgAppPermissionStore *object, handle_lookup (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name, const gchar *table_name,
const gchar *id) const gchar *id)
{ {
Table *table; Table *table;
@ -213,7 +213,7 @@ handle_lookup (XdgAppPermissionStore *object,
data = flatpak_db_entry_get_data (entry); data = flatpak_db_entry_get_data (entry);
permissions = get_app_permissions (entry); permissions = get_app_permissions (entry);
xdg_app_permission_store_complete_lookup (object, invocation, flatpak_permission_store_complete_lookup (object, invocation,
permissions, permissions,
g_variant_new_variant (data)); g_variant_new_variant (data));
@ -221,10 +221,10 @@ handle_lookup (XdgAppPermissionStore *object,
} }
static void static void
emit_deleted (XdgAppPermissionStore *object, emit_deleted (FlatpakPermissionStore *object,
const gchar *table_name, const gchar *table_name,
const gchar *id, const gchar *id,
FlatpakDbEntry *entry) FlatpakDbEntry *entry)
{ {
g_autoptr(GVariant) data = NULL; g_autoptr(GVariant) data = NULL;
g_autoptr(GVariant) permissions = NULL; g_autoptr(GVariant) permissions = NULL;
@ -232,7 +232,7 @@ emit_deleted (XdgAppPermissionStore *object,
data = flatpak_db_entry_get_data (entry); data = flatpak_db_entry_get_data (entry);
permissions = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("{sas}"), NULL, 0)); permissions = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("{sas}"), NULL, 0));
xdg_app_permission_store_emit_changed (object, flatpak_permission_store_emit_changed (object,
table_name, id, table_name, id,
TRUE, TRUE,
g_variant_new_variant (data), g_variant_new_variant (data),
@ -241,10 +241,10 @@ emit_deleted (XdgAppPermissionStore *object,
static void static void
emit_changed (XdgAppPermissionStore *object, emit_changed (FlatpakPermissionStore *object,
const gchar *table_name, const gchar *table_name,
const gchar *id, const gchar *id,
FlatpakDbEntry *entry) FlatpakDbEntry *entry)
{ {
g_autoptr(GVariant) data = NULL; g_autoptr(GVariant) data = NULL;
g_autoptr(GVariant) permissions = NULL; g_autoptr(GVariant) permissions = NULL;
@ -252,7 +252,7 @@ emit_changed (XdgAppPermissionStore *object,
data = flatpak_db_entry_get_data (entry); data = flatpak_db_entry_get_data (entry);
permissions = get_app_permissions (entry); permissions = get_app_permissions (entry);
xdg_app_permission_store_emit_changed (object, flatpak_permission_store_emit_changed (object,
table_name, id, table_name, id,
FALSE, FALSE,
g_variant_new_variant (data), g_variant_new_variant (data),
@ -260,10 +260,10 @@ emit_changed (XdgAppPermissionStore *object,
} }
static gboolean static gboolean
handle_delete (XdgAppPermissionStore *object, handle_delete (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name, const gchar *table_name,
const gchar *id) const gchar *id)
{ {
Table *table; Table *table;
@ -291,13 +291,13 @@ handle_delete (XdgAppPermissionStore *object,
} }
static gboolean static gboolean
handle_set (XdgAppPermissionStore *object, handle_set (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name, const gchar *table_name,
gboolean create, gboolean create,
const gchar *id, const gchar *id,
GVariant *app_permissions, GVariant *app_permissions,
GVariant *data) GVariant *data)
{ {
Table *table; Table *table;
GVariantIter iter; GVariantIter iter;
@ -349,13 +349,13 @@ handle_set (XdgAppPermissionStore *object,
} }
static gboolean static gboolean
handle_set_permission (XdgAppPermissionStore *object, handle_set_permission (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name, const gchar *table_name,
gboolean create, gboolean create,
const gchar *id, const gchar *id,
const gchar *app, const gchar *app,
const gchar *const *permissions) const gchar *const *permissions)
{ {
Table *table; Table *table;
@ -392,12 +392,12 @@ handle_set_permission (XdgAppPermissionStore *object,
} }
static gboolean static gboolean
handle_set_value (XdgAppPermissionStore *object, handle_set_value (FlatpakPermissionStore *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *table_name, const gchar *table_name,
gboolean create, gboolean create,
const gchar *id, const gchar *id,
GVariant *data) GVariant *data)
{ {
Table *table; Table *table;
@ -439,13 +439,13 @@ handle_set_value (XdgAppPermissionStore *object,
void void
flatpak_permission_store_start (GDBusConnection *connection) flatpak_permission_store_start (GDBusConnection *connection)
{ {
XdgAppPermissionStore *store; FlatpakPermissionStore *store;
GError *error = NULL; GError *error = NULL;
tables = g_hash_table_new_full (g_str_hash, g_str_equal, tables = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, (GDestroyNotify) table_free); g_free, (GDestroyNotify) table_free);
store = xdg_app_permission_store_skeleton_new (); store = flatpak_permission_store_skeleton_new ();
g_signal_connect (store, "handle-list", G_CALLBACK (handle_list), NULL); g_signal_connect (store, "handle-list", G_CALLBACK (handle_list), NULL);
g_signal_connect (store, "handle-lookup", G_CALLBACK (handle_lookup), NULL); g_signal_connect (store, "handle-lookup", G_CALLBACK (handle_lookup), NULL);

10
session-helper/flatpak-session-helper.c
View File

@ -30,11 +30,11 @@
static char *monitor_dir; static char *monitor_dir;
static gboolean static gboolean
handle_request_monitor (XdgAppSessionHelper *object, handle_request_monitor (FlatpakSessionHelper *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
gpointer user_data) gpointer user_data)
{ {
xdg_app_session_helper_complete_request_monitor (object, invocation, flatpak_session_helper_complete_request_monitor (object, invocation,
monitor_dir); monitor_dir);
return TRUE; return TRUE;
@ -45,12 +45,12 @@ on_bus_acquired (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
XdgAppSessionHelper *helper; FlatpakSessionHelper *helper;
GError *error = NULL; GError *error = NULL;
flatpak_permission_store_start (connection); flatpak_permission_store_start (connection);
helper = xdg_app_session_helper_skeleton_new (); helper = flatpak_session_helper_skeleton_new ();
g_signal_connect (helper, "handle-request-monitor", G_CALLBACK (handle_request_monitor), NULL); g_signal_connect (helper, "handle-request-monitor", G_CALLBACK (handle_request_monitor), NULL);
@ -134,7 +134,7 @@ main (int argc,
g_set_prgname (argv[0]); g_set_prgname (argv[0]);
monitor_dir = g_build_filename (g_get_user_runtime_dir (), "xdg-app-monitor", NULL); monitor_dir = g_build_filename (g_get_user_runtime_dir (), "flatpak-monitor", NULL);
if (g_mkdir_with_parents (monitor_dir, 0755) != 0) if (g_mkdir_with_parents (monitor_dir, 0755) != 0)
{ {
g_print ("Can't create %s\n", monitor_dir); g_print ("Can't create %s\n", monitor_dir);

7
session-helper/flatpak-session-helper.service.in 100644
View File

@ -0,0 +1,7 @@
[Unit]
Description=flatpak session helper
[Service]
BusName=org.freedesktop.Flatpak
ExecStart=@libexecdir@/flatpak-session-helper
Type=dbus

4
session-helper/org.freedesktop.Flatpak.service.in 100644
View File

@ -0,0 +1,4 @@
[D-BUS Service]
Name=org.freedesktop.Flatpak
Exec=@libexecdir@/flatpak-session-helper
SystemdService=flatpak-session-helper.service

4
session-helper/org.freedesktop.XdgApp.service.in
View File

@ -1,4 +0,0 @@
[D-BUS Service]
Name=org.freedesktop.XdgApp
Exec=@libexecdir@/xdg-app-session-helper
SystemdService=xdg-app-session-helper.service

7
session-helper/xdg-app-session-helper.service.in
View File

@ -1,7 +0,0 @@
[Unit]
Description=xdg-app session helper
[Service]
BusName=org.freedesktop.XdgApp
ExecStart=@libexecdir@/xdg-app-session-helper
Type=dbus

26
system-helper/Makefile.am.inc
View File

@ -1,34 +1,34 @@
libexec_PROGRAMS += \ libexec_PROGRAMS += \
xdg-app-system-helper \ flatpak-system-helper \
$(NULL) $(NULL)
dbussystemservicedir = $(datadir)/dbus-1/system-services dbussystemservicedir = $(datadir)/dbus-1/system-services
service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service
dbusconfdir = ${sysconfdir}/dbus-1/system.d dbusconfdir = ${sysconfdir}/dbus-1/system.d
dbusconf_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.conf dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf
service_in_files += system-helper/xdg-app-system-helper.service.in service_in_files += system-helper/flatpak-system-helper.service.in
systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service systemdsystemunit_DATA = system-helper/flatpak-system-helper.service
xdg_app_system_helper_SOURCES = \ flatpak_system_helper_SOURCES = \
system-helper/flatpak-system-helper.c \ system-helper/flatpak-system-helper.c \
lib/flatpak-error.c \ lib/flatpak-error.c \
$(NULL) $(NULL)
xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
xdg_app_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS) flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
polkit_rulesdir = $(datadir)/polkit-1/rules.d polkit_rulesdir = $(datadir)/polkit-1/rules.d
dist_polkit_rules_DATA = \ dist_polkit_rules_DATA = \
system-helper/org.freedesktop.XdgApp.rules system-helper/org.freedesktop.Flatpak.rules
polkit_policydir = $(datadir)/polkit-1/actions polkit_policydir = $(datadir)/polkit-1/actions
dist_polkit_policy_DATA = \ dist_polkit_policy_DATA = \
system-helper/org.freedesktop.XdgApp.policy system-helper/org.freedesktop.Flatpak.policy
@INTLTOOL_POLICY_RULE@ @INTLTOOL_POLICY_RULE@
EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.XdgApp.SystemHelper.conf EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf
DISTCLEANFILES += system-helper/org.freedesktop.XdgApp.policy DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy

8
system-helper/flatpak-system-helper.c
View File

@ -43,7 +43,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitDetails, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref)
static gboolean static gboolean
handle_deploy (XdgAppSystemHelper *object, handle_deploy (FlatpakSystemHelper *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *arg_repo_path, const gchar *arg_repo_path,
guint32 arg_flags, guint32 arg_flags,
@ -155,7 +155,7 @@ handle_deploy (XdgAppSystemHelper *object,
} }
} }
xdg_app_system_helper_complete_deploy (object, invocation); flatpak_system_helper_complete_deploy (object, invocation);
return TRUE; return TRUE;
} }
@ -249,10 +249,10 @@ on_bus_acquired (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
XdgAppSystemHelper *helper; FlatpakSystemHelper *helper;
GError *error = NULL; GError *error = NULL;
helper = xdg_app_system_helper_skeleton_new (); helper = flatpak_system_helper_skeleton_new ();
g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (helper), g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (helper),
G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);

7
system-helper/flatpak-system-helper.service.in 100644
View File

@ -0,0 +1,7 @@
[Unit]
Description=flatpak system helper
[Service]
BusName=org.freedesktop.Flatpak.SystemHelper
ExecStart=@libexecdir@/flatpak-system-helper
Type=dbus

12
system-helper/org.freedesktop.XdgApp.SystemHelper.conf → system-helper/org.freedesktop.Flatpak.SystemHelper.conf
View File

@ -6,19 +6,19 @@
<busconfig> <busconfig>
<!-- This configuration file specifies the required security policies <!-- This configuration file specifies the required security policies
for the the xdg-app system helper to work. --> for the the flatpak system helper to work. -->
<policy user="root"> <policy user="root">
<allow own="org.freedesktop.XdgApp.SystemHelper"/> <allow own="org.freedesktop.Flatpak.SystemHelper"/>
</policy> </policy>
<!-- Allow anyone to call into the service - we'll reject callers using PolicyKit --> <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
<policy context="default"> <policy context="default">
<allow send_destination="org.freedesktop.XdgApp.SystemHelper" <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
send_interface="org.freedesktop.XdgApp.SystemHelper"/> send_interface="org.freedesktop.Flatpak.SystemHelper"/>
<allow send_destination="org.freedesktop.XdgApp.SystemHelper" <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
send_interface="org.freedesktop.DBus.Introspectable"/> send_interface="org.freedesktop.DBus.Introspectable"/>
<allow send_destination="org.freedesktop.ColorManager" <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
send_interface="org.freedesktop.DBus.Peer"/> send_interface="org.freedesktop.DBus.Peer"/>
</policy> </policy>

4
system-helper/org.freedesktop.Flatpak.SystemHelper.service.in 100644
View File

@ -0,0 +1,4 @@
[D-BUS Service]
Name=org.freedesktop.Flatpak.SystemHelper
Exec=@libexecdir@/flatpak-system-helper
SystemdService=flatpak-system-helper.service

12
system-helper/org.freedesktop.XdgApp.policy.in → system-helper/org.freedesktop.Flatpak.policy.in
View File

@ -5,15 +5,15 @@
<policyconfig> <policyconfig>
<!-- <!--
Policy definitions for XdgApp system actions. Policy definitions for Flatpak system actions.
Copyright (c) 2016 Alexander Larsson <alexl@redhat.com> Copyright (c) 2016 Alexander Larsson <alexl@redhat.com>
--> -->
<vendor>The XdgApp Project</vendor> <vendor>The Flatpak Project</vendor>
<vendor_url>https://cgit.freedesktop.org/xdg-app/xdg-app/</vendor_url> <vendor_url>https://cgit.freedesktop.org/xdg-app/xdg-app/</vendor_url>
<icon_name>package-x-generic</icon_name> <icon_name>package-x-generic</icon_name>
<action id="org.freedesktop.XdgApp.app-install"> <action id="org.freedesktop.Flatpak.app-install">
<!-- SECURITY: <!-- SECURITY:
- Normal users do not need authentication to install signed applications - Normal users do not need authentication to install signed applications
from signed repositories, as this cannot exploit a system. from signed repositories, as this cannot exploit a system.
@ -30,7 +30,7 @@
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.XdgApp.runtime-install"> <action id="org.freedesktop.Flatpak.runtime-install">
<!-- SECURITY: <!-- SECURITY:
- Normal users do not need authentication to install signed applications - Normal users do not need authentication to install signed applications
from signed repositories, as this cannot exploit a system. from signed repositories, as this cannot exploit a system.
@ -47,7 +47,7 @@
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.XdgApp.app-update"> <action id="org.freedesktop.Flatpak.app-update">
<!-- SECURITY: <!-- SECURITY:
- Normal users do not require admin authentication to update an - Normal users do not require admin authentication to update an
app as the commit will be signed, and the action is required app as the commit will be signed, and the action is required
@ -65,7 +65,7 @@
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.XdgApp.runtime-update"> <action id="org.freedesktop.Flatpak.runtime-update">
<!-- SECURITY: <!-- SECURITY:
- Normal users do not require admin authentication to update a - Normal users do not require admin authentication to update a
runtime as the commit will be signed, and the action is required runtime as the commit will be signed, and the action is required

4
system-helper/org.freedesktop.XdgApp.rules → system-helper/org.freedesktop.Flatpak.rules
View File

@ -1,6 +1,6 @@
polkit.addRule(function(action, subject) { polkit.addRule(function(action, subject) {
if ((action.id == "org.freedesktop.XdgApp.app-install" || if ((action.id == "org.freedesktop.Flatpak.app-install" ||
action.id == "org.freedesktop.XdgApp.runtime-install") && action.id == "org.freedesktop.Flatpak.runtime-install") &&
subject.active == true && subject.local == true && subject.active == true && subject.local == true &&
subject.isInGroup("wheel")) { subject.isInGroup("wheel")) {
return polkit.Result.YES; return polkit.Result.YES;

4
system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
View File

@ -1,4 +0,0 @@
[D-BUS Service]
Name=org.freedesktop.XdgApp.SystemHelper
Exec=@libexecdir@/xdg-app-system-helper
SystemdService=xdg-app-system-helper.service

7
system-helper/xdg-app-system-helper.service.in
View File

@ -1,7 +0,0 @@
[Unit]
Description=xdg-app system helper
[Service]
BusName=org.freedesktop.XdgApp.SystemHelper
ExecStart=@libexecdir@/xdg-app-system-helper
Type=dbus

16
tests/Makefile.am.inc
View File

@ -1,7 +1,7 @@
TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \ TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \ FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \
FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \ FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \
FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \ FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \
GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \ GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \ LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
PATH=$$(cd $(top_builddir) && pwd):$${PATH} \ PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
@ -25,22 +25,22 @@ test_doc_portal_LDADD = \
$(NULL) $(NULL)
test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources) test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources)
EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.XdgApp.service EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.Flatpak.service
tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in
mkdir -p tests/services mkdir -p tests/services
$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@ $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
tests/services/org.freedesktop.XdgApp.service: session-helper/org.freedesktop.XdgApp.service.in tests/services/org.freedesktop.Flatpak.service: session-helper/org.freedesktop.Flatpak.service.in
mkdir -p tests/services mkdir -p tests/services
$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@ $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.XdgApp.service tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.Flatpak.service
install-test-data-hook: install-test-data-hook:
if ENABLE_INSTALLED_TESTS if ENABLE_INSTALLED_TESTS
mkdir -p $(DESTDIR)$(installed_testdir)/services mkdir -p $(DESTDIR)$(installed_testdir)/services
ln -sf $(dbus_servicedir)/org.freedesktop.XdgApp.service $(DESTDIR)$(installed_testdir)/services/ ln -sf $(dbus_servicedir)/org.freedesktop.Flatpak.service $(DESTDIR)$(installed_testdir)/services/
ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/ ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/
endif endif
@ -76,9 +76,9 @@ test_scripts = \
test_programs = testdb test-doc-portal test_programs = testdb test-doc-portal
@VALGRIND_CHECK_RULES@ @VALGRIND_CHECK_RULES@
VALGRIND_SUPPRESSIONS_FILES=tests/xdg-app.supp VALGRIND_SUPPRESSIONS_FILES=tests/flatpak-valgrind.supp
EXTRA_DIST += tests/xdg-app.supp tests/dbs/no_tables EXTRA_DIST += tests/flatpak-valgrind.supp tests/dbs/no_tables
CLEANFILES += \ CLEANFILES += \
tests/services/org.freedesktop.XdgApp.service \ tests/services/org.freedesktop.Flatpak.service \
tests/services/org.freedesktop.portal.Documents.service \ tests/services/org.freedesktop.portal.Documents.service \
$(NULL) $(NULL)

0
tests/xdg-app-valgrind.supp → tests/flatpak-valgrind.supp
View File

20
tests/libtest.sh
View File

@ -62,20 +62,20 @@ if test -n "${OT_TESTS_DEBUG:-}"; then
fi fi
if test -n "${OT_TESTS_VALGRIND:-}"; then if test -n "${OT_TESTS_VALGRIND:-}"; then
CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/xdg-app-valgrind.supp" CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/flatpak-valgrind.supp"
else else
CMD_PREFIX="" CMD_PREFIX=""
fi fi
# We need this to be in /var/tmp because /tmp has no xattr support # We need this to be in /var/tmp because /tmp has no xattr support
TEST_DATA_DIR=`mktemp -d /var/tmp/test-xdg-app-XXXXXX` TEST_DATA_DIR=`mktemp -d /var/tmp/test-flatpak-XXXXXX`
export XDG_DATA_HOME=${TEST_DATA_DIR}/share export XDG_DATA_HOME=${TEST_DATA_DIR}/share
export USERDIR=${TEST_DATA_DIR}/share/xdg-app export USERDIR=${TEST_DATA_DIR}/share/xdg-app
export ARCH=`xdg-app --default-arch` export ARCH=`flatpak --default-arch`
export XDG_APP="${CMD_PREFIX} xdg-app" export FLATPAK="${CMD_PREFIX} flatpak"
assert_streq () { assert_streq () {
test "$1" = "$2" || (echo 1>&2 "$1 != $2"; exit 1) test "$1" = "$2" || (echo 1>&2 "$1 != $2"; exit 1)
@ -146,7 +146,7 @@ assert_file_empty() {
setup_repo () { setup_repo () {
. $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null . $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null
. $(dirname $0)/make-test-app.sh > /dev/null . $(dirname $0)/make-test-app.sh > /dev/null
xdg-app remote-add --user --no-gpg-verify test-repo repo flatpak remote-add --user --no-gpg-verify test-repo repo
} }
setup_sdk_repo () { setup_sdk_repo () {
@ -155,21 +155,21 @@ setup_sdk_repo () {
install_repo () { install_repo () {
${XDG_APP} --user install test-repo org.test.Platform master ${FLATPAK} --user install test-repo org.test.Platform master
${XDG_APP} --user install test-repo org.test.Hello master ${FLATPAK} --user install test-repo org.test.Hello master
} }
install_sdk_repo () { install_sdk_repo () {
${XDG_APP} --user install test-repo org.test.Sdk master ${FLATPAK} --user install test-repo org.test.Sdk master
} }
run () { run () {
${CMD_PREFIX} xdg-app run "$@" ${CMD_PREFIX} flatpak run "$@"
} }
run_sh () { run_sh () {
${CMD_PREFIX} xdg-app run --command=bash ${ARGS-} org.test.Hello -c "$*" ${CMD_PREFIX} flatpak run --command=bash ${ARGS-} org.test.Hello -c "$*"
} }
sed s#@testdir@#${test_builddir}# ${test_srcdir}/session.conf.in > session.conf sed s#@testdir@#${test_builddir}# ${test_srcdir}/session.conf.in > session.conf

10
tests/make-test-app.sh
View File

@ -5,7 +5,7 @@ set -e
DIR=`mktemp -d` DIR=`mktemp -d`
# Init dir # Init dir
xdg-app build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform flatpak build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
mkdir -p ${DIR}/files/bin mkdir -p ${DIR}/files/bin
cat > ${DIR}/files/bin/hello.sh <<EOF cat > ${DIR}/files/bin/hello.sh <<EOF
@ -29,7 +29,7 @@ cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/
mkdir -p ${DIR}/files/share/app-info/xmls mkdir -p ${DIR}/files/share/app-info/xmls
mkdir -p ${DIR}/files/share/app-info/icons/xdg-app/64x64 mkdir -p ${DIR}/files/share/app-info/icons/flatpak/64x64
gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<components version="0.8"> <components version="0.8">
@ -45,8 +45,8 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
</component> </component>
</components> </components>
EOF EOF
cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/xdg-app/64x64/ cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/
xdg-app build-finish --command=hello.sh ${DIR} flatpak build-finish --command=hello.sh ${DIR}
xdg-app build-export repo ${DIR} flatpak build-export repo ${DIR}
rm -rf ${DIR} rm -rf ${DIR}

18
tests/make-test-bundles.sh
View File

@ -9,18 +9,18 @@ URL=file://`pwd`/repo
REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)` REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)`
xdg-app build-bundle repo hello.xdgapp org.test.Hello flatpak build-bundle repo hello.pak org.test.Hello
xdg-app build-bundle repo hello-key.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello flatpak build-bundle repo hello-key.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
xdg-app build-bundle repo --repo-url=${URL} hello-origin.xdgapp org.test.Hello flatpak build-bundle repo --repo-url=${URL} hello-origin.pak org.test.Hello
xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.xdgapp org.test.Hello flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.pak org.test.Hello
ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
xdg-app build-bundle repo hello-signed.xdgapp org.test.Hello flatpak build-bundle repo hello-signed.pak org.test.Hello
xdg-app build-bundle repo hello-key-signed.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello flatpak build-bundle repo hello-key-signed.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
xdg-app build-bundle repo --repo-url=${URL} hello-origin-signed.xdgapp org.test.Hello flatpak build-bundle repo --repo-url=${URL} hello-origin-signed.pak org.test.Hello
xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.xdgapp org.test.Hello flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.pak org.test.Hello
REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)` REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)`
ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
xdg-app build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.xdgapp org.test.Platform flatpak build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.pak org.test.Platform

4
tests/make-test-runtime.sh
View File

@ -7,7 +7,7 @@ DIR=`mktemp -d`
ID=$1 ID=$1
shift shift
xdg-app build-init ${DIR} ${ID} ${ID} ${ID} flatpak build-init ${DIR} ${ID} ${ID} ${ID}
sed -i s/Application/Runtime/ ${DIR}/metadata sed -i s/Application/Runtime/ ${DIR}/metadata
# Add bash and dependencies # Add bash and dependencies
@ -26,5 +26,5 @@ for i in `sort -u $T`; do
cp "$i" ${DIR}/usr/lib/ cp "$i" ${DIR}/usr/lib/
done done
xdg-app build-export --runtime repo ${DIR} flatpak build-export --runtime repo ${DIR}
rm -rf ${DIR} rm -rf ${DIR}

6
tests/test-basic.sh
View File

@ -23,19 +23,19 @@ set -euo pipefail
echo "1..3" echo "1..3"
${XDG_APP} --version > version_out ${FLATPAK} --version > version_out
VERSION=`cat $(dirname $0)/package_version.txt` VERSION=`cat $(dirname $0)/package_version.txt`
assert_file_has_content version_out "^flatpak $VERSION$" assert_file_has_content version_out "^flatpak $VERSION$"
echo "ok version" echo "ok version"
${XDG_APP} --help > help_out ${FLATPAK} --help > help_out
assert_file_has_content help_out "^Usage:$" assert_file_has_content help_out "^Usage:$"
echo "ok help" echo "ok help"
${XDG_APP} --default-arch > /dev/null ${FLATPAK} --default-arch > /dev/null
echo "ok default arch" echo "ok default arch"

10
tests/test-builder.sh
View File

@ -35,7 +35,7 @@ cd $TEST_DATA_DIR/
cp -a $(dirname $0)/test-configure . cp -a $(dirname $0)/test-configure .
echo "version1" > app-data echo "version1" > app-data
cp $(dirname $0)/test.json . cp $(dirname $0)/test.json .
xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
assert_file_has_content appdir/files/share/app-data version1 assert_file_has_content appdir/files/share/app-data version1
assert_file_has_content appdir/metadata shared=network; assert_file_has_content appdir/metadata shared=network;
@ -46,12 +46,12 @@ assert_not_has_file appdir/files/bin/file.cleanup
assert_has_file appdir/files/cleaned_up > out assert_has_file appdir/files/cleaned_up > out
${XDG_APP} build appdir /app/bin/hello2.sh > hello_out2 ${FLATPAK} build appdir /app/bin/hello2.sh > hello_out2
assert_file_has_content hello_out2 '^Hello world2, from a sandbox$' assert_file_has_content hello_out2 '^Hello world2, from a sandbox$'
echo "ok build" echo "ok build"
${XDG_APP} --user install test-repo org.test.Hello2 master ${FLATPAK} --user install test-repo org.test.Hello2 master
run org.test.Hello2 > hello_out3 run org.test.Hello2 > hello_out3
assert_file_has_content hello_out3 '^Hello world2, from a sandbox$' assert_file_has_content hello_out3 '^Hello world2, from a sandbox$'
@ -61,10 +61,10 @@ assert_file_has_content app_data_1 version1
echo "ok install+run" echo "ok install+run"
echo "version2" > app-data echo "version2" > app-data
xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
assert_file_has_content appdir/files/share/app-data version2 assert_file_has_content appdir/files/share/app-data version2
${XDG_APP} --user update org.test.Hello2 master ${FLATPAK} --user update org.test.Hello2 master
run --command=cat org.test.Hello2 /app/share/app-data > app_data_2 run --command=cat org.test.Hello2 /app/share/app-data > app_data_2
assert_file_has_content app_data_2 version2 assert_file_has_content app_data_2 version2

26
tests/test-run.sh
View File

@ -40,7 +40,7 @@ assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/files
assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/export assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/export
assert_has_file $USERDIR/exports/share/applications/org.test.Hello.desktop assert_has_file $USERDIR/exports/share/applications/org.test.Hello.desktop
# Ensure Exec key is rewritten # Ensure Exec key is rewritten
assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/xdg-app run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
assert_has_file $USERDIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $USERDIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
# Ensure triggers ran # Ensure triggers ran
@ -49,14 +49,14 @@ assert_file_has_content $USERDIR/exports/share/applications/mimeinfo.cache x-tes
assert_has_file $USERDIR/exports/share/icons/hicolor/icon-theme.cache assert_has_file $USERDIR/exports/share/icons/hicolor/icon-theme.cache
assert_has_file $USERDIR/exports/share/icons/hicolor/index.theme assert_has_file $USERDIR/exports/share/icons/hicolor/index.theme
$XDG_APP list --user | grep org.test.Hello > /dev/null $FLATPAK list --user | grep org.test.Hello > /dev/null
$XDG_APP list --user -d | grep org.test.Hello | grep test-repo > /dev/null $FLATPAK list --user -d | grep org.test.Hello | grep test-repo > /dev/null
$XDG_APP list --user -d | grep org.test.Hello | grep current > /dev/null $FLATPAK list --user -d | grep org.test.Hello | grep current > /dev/null
$XDG_APP list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null $FLATPAK list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null
$XDG_APP info --user org.test.Hello > /dev/null $FLATPAK info --user org.test.Hello > /dev/null
$XDG_APP info --user org.test.Hello | grep test-repo > /dev/null $FLATPAK info --user org.test.Hello | grep test-repo > /dev/null
$XDG_APP info --user org.test.Hello | grep $ID > /dev/null $FLATPAK info --user org.test.Hello | grep $ID > /dev/null
echo "ok install" echo "ok install"
@ -65,10 +65,10 @@ assert_file_has_content hello_out '^Hello world, from a sandbox$'
echo "ok hello" echo "ok hello"
run_sh cat /run/user/`id -u`/xdg-app-info > xai run_sh cat /run/user/`id -u`/flatpak-info > fpi
assert_file_has_content xai '^name=org.test.Hello$' assert_file_has_content fpi '^name=org.test.Hello$'
echo "ok xdg-app-info" echo "ok flatpak-info"
run_sh readlink /proc/self/ns/net > unshared_net_ns run_sh readlink /proc/self/ns/net > unshared_net_ns
ARGS="--share=network" run_sh readlink /proc/self/ns/net > shared_net_ns ARGS="--share=network" run_sh readlink /proc/self/ns/net > shared_net_ns
@ -89,12 +89,12 @@ ARGS="--filesystem=host" run_sh cat $(dirname $0)/package_version.txt > /dev/nul
echo "ok namespaces" echo "ok namespaces"
$XDG_APP override --user --filesystem=host org.test.Hello $FLATPAK override --user --filesystem=host org.test.Hello
run_sh cat $(dirname $0)/package_version.txt &> /dev/null run_sh cat $(dirname $0)/package_version.txt &> /dev/null
if ARGS="--nofilesystem=host" run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then if ARGS="--nofilesystem=host" run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
assert_not_reached "Unexpectedly allowed to access --nofilesystem=host file" assert_not_reached "Unexpectedly allowed to access --nofilesystem=host file"
fi fi
$XDG_APP override --user --nofilesystem=host org.test.Hello $FLATPAK override --user --nofilesystem=host org.test.Hello
if run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then if run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
assert_not_reached "Unexpectedly allowed to access file" assert_not_reached "Unexpectedly allowed to access file"

31
tests/xdg-app.supp
View File

@ -1,31 +0,0 @@
{
glib _dl_init
Memcheck:Leak
fun:*alloc
...
fun:_dl_init
}
{
glib _static_types
Memcheck:Leak
fun:*alloc
...
fun:g_type_register_static
}
{
glib _static_typ
Memcheck:Leak
fun:calloc
fun:g_malloc0
fun:type_class_init_Wm
}
{
gio dbus worker thread
Memcheck:Leak
fun:calloc
...
fun:_g_dbus_worker_new
}