From 8abbc0186efe977cec2a3214e7aa3703e9f1169f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 9 May 2016 11:07:53 +0200 Subject: [PATCH] Rename everything but the on-disk location to flatpak --- .gitignore | 38 ++++---- Makefile.am | 26 +++--- README.md | 4 +- app/Makefile.am.inc | 8 +- app/flatpak-builtins-build-bundle.c | 10 +-- app/flatpak-builtins-build-import-bundle.c | 4 +- builder/Makefile.am.inc | 8 +- builder/builder-context.c | 6 +- builder/builder-main.c | 2 +- builder/builder-manifest.c | 24 ++--- builder/builder-module.c | 2 +- builder/builder-source-shell.c | 2 +- common/Makefile.am.inc | 6 +- common/flatpak-db.c | 2 +- common/flatpak-db.h | 2 +- common/flatpak-dir.c | 36 ++++---- common/flatpak-portal-error.c | 4 +- common/flatpak-portal-error.h | 2 +- common/flatpak-run.c | 22 ++--- common/flatpak-utils.c | 18 ++-- common/flatpak-utils.h | 4 +- completion/{xdg-app => flatpak} | 22 ++--- data/Makefile.am.inc | 4 +- ...XdgApp.xml => org.freedesktop.Flatpak.xml} | 6 +- dbus-proxy/Makefile.am.inc | 10 +-- doc/Makefile.am | 50 +++++------ ...ld-bundle.xml => flatpak-build-bundle.xml} | 26 +++--- ...ld-export.xml => flatpak-build-export.xml} | 26 +++--- ...ld-finish.xml => flatpak-build-finish.xml} | 22 ++--- ...le.xml => flatpak-build-import-bundle.xml} | 18 ++-- ...-build-init.xml => flatpak-build-init.xml} | 24 ++--- ...-build-sign.xml => flatpak-build-sign.xml} | 20 ++--- ...repo.xml => flatpak-build-update-repo.xml} | 22 ++--- doc/{xdg-app-build.xml => flatpak-build.xml} | 24 ++--- ...dg-app-builder.xml => flatpak-builder.xml} | 58 ++++++------ doc/{xdg-app-enter.xml => flatpak-enter.xml} | 18 ++-- ...xport-file.xml => flatpak-export-file.xml} | 18 ++-- doc/{xdg-app-info.xml => flatpak-info.xml} | 20 ++--- ...dg-app-install.xml => flatpak-install.xml} | 28 +++--- doc/{xdg-app-list.xml => flatpak-list.xml} | 20 ++--- ...e-current.xml => flatpak-make-current.xml} | 20 ++--- ...-app-override.xml => flatpak-override.xml} | 22 ++--- ...-remote-add.xml => flatpak-remote-add.xml} | 24 ++--- ...e-delete.xml => flatpak-remote-delete.xml} | 24 ++--- ...emote-list.xml => flatpak-remote-list.xml} | 20 ++--- ...pp-remote-ls.xml => flatpak-remote-ls.xml} | 16 ++-- ...e-modify.xml => flatpak-remote-modify.xml} | 24 ++--- doc/{xdg-app-run.xml => flatpak-run.xml} | 24 ++--- ...pp-uninstall.xml => flatpak-uninstall.xml} | 12 +-- ...{xdg-app-update.xml => flatpak-update.xml} | 20 ++--- doc/{xdg-app.xml => flatpak.xml} | 68 +++++++------- doc/reference/.gitignore | 24 ++--- doc/reference/version.xml.in | 2 +- .../xdg-document-portal.service.in | 2 +- document-portal/xdp-main.c | 10 +-- env.d/{xdg-app.env.in => flatpak.env.in} | 0 lib/flatpak-error.c | 6 +- lib/flatpak-error.h | 2 +- lib/flatpak-installation.c | 16 ++-- lib/flatpak-installed-ref.c | 2 +- lib/flatpak-ref.c | 4 +- lib/flatpak-remote-ref.c | 2 +- lib/flatpak-remote.c | 2 +- lib/flatpak-version-macros.h.in | 2 +- lib/test-lib.c | 2 +- po/POTFILES.in | 2 +- profile/{xdg-app.sh.in => flatpak.sh.in} | 2 +- session-helper/Makefile.am.inc | 16 ++-- session-helper/flatpak-permission-store.c | 90 +++++++++---------- session-helper/flatpak-session-helper.c | 10 +-- .../flatpak-session-helper.service.in | 7 ++ .../org.freedesktop.Flatpak.service.in | 4 + .../org.freedesktop.XdgApp.service.in | 4 - .../xdg-app-session-helper.service.in | 7 -- system-helper/Makefile.am.inc | 26 +++--- system-helper/flatpak-system-helper.c | 8 +- .../flatpak-system-helper.service.in | 7 ++ ...org.freedesktop.Flatpak.SystemHelper.conf} | 12 +-- ...reedesktop.Flatpak.SystemHelper.service.in | 4 + ...y.in => org.freedesktop.Flatpak.policy.in} | 12 +-- ...pp.rules => org.freedesktop.Flatpak.rules} | 4 +- ...freedesktop.XdgApp.SystemHelper.service.in | 4 - .../xdg-app-system-helper.service.in | 7 -- tests/Makefile.am.inc | 16 ++-- ...pp-valgrind.supp => flatpak-valgrind.supp} | 0 tests/libtest.sh | 20 ++--- tests/make-test-app.sh | 10 +-- tests/make-test-bundles.sh | 18 ++-- tests/make-test-runtime.sh | 4 +- tests/test-basic.sh | 6 +- tests/test-builder.sh | 10 +-- tests/test-run.sh | 26 +++--- tests/xdg-app.supp | 31 ------- 93 files changed, 676 insertions(+), 707 deletions(-) rename completion/{xdg-app => flatpak} (95%) rename data/{org.freedesktop.XdgApp.xml => org.freedesktop.Flatpak.xml} (94%) rename doc/{xdg-app-build-bundle.xml => flatpak-build-bundle.xml} (86%) rename doc/{xdg-app-build-export.xml => flatpak-build-export.xml} (91%) rename doc/{xdg-app-build-finish.xml => flatpak-build-finish.xml} (94%) rename doc/{xdg-app-build-import-bundle.xml => flatpak-build-import-bundle.xml} (84%) rename doc/{xdg-app-build-init.xml => flatpak-build-init.xml} (89%) rename doc/{xdg-app-build-sign.xml => flatpak-build-sign.xml} (88%) rename doc/{xdg-app-build-update-repo.xml => flatpak-build-update-repo.xml} (87%) rename doc/{xdg-app-build.xml => flatpak-build.xml} (93%) rename doc/{xdg-app-builder.xml => flatpak-builder.xml} (95%) rename doc/{xdg-app-enter.xml => flatpak-enter.xml} (86%) rename doc/{xdg-app-export-file.xml => flatpak-export-file.xml} (90%) rename doc/{xdg-app-info.xml => flatpak-info.xml} (90%) rename doc/{xdg-app-install.xml => flatpak-install.xml} (89%) rename doc/{xdg-app-list.xml => flatpak-list.xml} (88%) rename doc/{xdg-app-make-current.xml => flatpak-make-current.xml} (86%) rename doc/{xdg-app-override.xml => flatpak-override.xml} (93%) rename doc/{xdg-app-remote-add.xml => flatpak-remote-add.xml} (89%) rename doc/{xdg-app-remote-delete.xml => flatpak-remote-delete.xml} (81%) rename doc/{xdg-app-remote-list.xml => flatpak-remote-list.xml} (86%) rename doc/{xdg-app-remote-ls.xml => flatpak-remote-ls.xml} (91%) rename doc/{xdg-app-remote-modify.xml => flatpak-remote-modify.xml} (90%) rename doc/{xdg-app-run.xml => flatpak-run.xml} (95%) rename doc/{xdg-app-uninstall.xml => flatpak-uninstall.xml} (94%) rename doc/{xdg-app-update.xml => flatpak-update.xml} (92%) rename doc/{xdg-app.xml => flatpak.xml} (82%) rename env.d/{xdg-app.env.in => flatpak.env.in} (100%) rename profile/{xdg-app.sh.in => flatpak.sh.in} (74%) create mode 100644 session-helper/flatpak-session-helper.service.in create mode 100644 session-helper/org.freedesktop.Flatpak.service.in delete mode 100644 session-helper/org.freedesktop.XdgApp.service.in delete mode 100644 session-helper/xdg-app-session-helper.service.in create mode 100644 system-helper/flatpak-system-helper.service.in rename system-helper/{org.freedesktop.XdgApp.SystemHelper.conf => org.freedesktop.Flatpak.SystemHelper.conf} (61%) create mode 100644 system-helper/org.freedesktop.Flatpak.SystemHelper.service.in rename system-helper/{org.freedesktop.XdgApp.policy.in => org.freedesktop.Flatpak.policy.in} (90%) rename system-helper/{org.freedesktop.XdgApp.rules => org.freedesktop.Flatpak.rules} (58%) delete mode 100644 system-helper/org.freedesktop.XdgApp.SystemHelper.service.in delete mode 100644 system-helper/xdg-app-system-helper.service.in rename tests/{xdg-app-valgrind.supp => flatpak-valgrind.supp} (100%) delete mode 100644 tests/xdg-app.supp diff --git a/.gitignore b/.gitignore index 728eeaca..8174be5a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,33 +27,33 @@ stamp-h1 config.h.in stamp-* gtk-doc.make -xdg-app -xdg-app-session-helper +flatpak +flatpak-session-helper xdg-document-portal -xdg-app-builder +flatpak-builder testdb doc/*.1 *~ -profile/xdg-app.sh -xdg-app-dbus.[ch] -xdg-app-systemd-dbus.[ch] -xdg-app-resources.[ch] -xdg-dbus-proxy -xdg-app-system-helper +profile/flatpak.sh +flatpak-dbus.[ch] +flatpak-systemd-dbus.[ch] +flatpak-resources.[ch] +flatpak-dbus-proxy +flatpak-system-helper xdg-desktop-portal *.service -xdg-app.env -xdg-app.sh +flatpak.env +flatpak.sh document-portal/xdp-dbus.[ch] document-portal/xdp-resources.[ch] .dirstamp test-suite*.log -lib/xdg-app-version-macros.h -xdg-app.pc -lib/xdg-app-enum-types.c -lib/xdg-app-enum-types.h +lib/flatpak-version-macros.h +flatpak.pc +lib/flatpak-enum-types.c +lib/flatpak-enum-types.h test-libflatpak -XdgApp-1.0.* +Flatpak-1.0.* /doc/reference/gtkdoc-check.log /doc/reference/gtkdoc-check.test /doc/reference/gtkdoc-check.trs @@ -65,8 +65,8 @@ XdgApp-1.0.* /tests/test-keyring/.gpg-v21-migrated /tests/test-keyring/private-keys-v1.d/ /tests/test-keyring/trustdb.gpg -/tests/hello*.xdgapp -/tests/platform*.xdgapp +/tests/hello*.pak +/tests/platform*.pak /tests/repo /tests/package_version.txt *.test @@ -76,5 +76,5 @@ XdgApp-1.0.* po/.intltool-merge-cache po/Makefile.in.in po/POTFILES -system-helper/org.freedesktop.XdgApp.policy +system-helper/org.freedesktop.Flatpak.policy bwrap diff --git a/Makefile.am b/Makefile.am index 90855ae3..c5da158a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,17 +31,17 @@ CLEANFILES += $(dbus_service_DATA) CLEANFILES += $(systemduserunit_DATA) EXTRA_DIST += $(service_in_files) -XDG_APP_BINDIR=$(bindir) +FLATPAK_BINDIR=$(bindir) AM_CPPFLAGS = \ - -DFLATPAK_BINDIR=\"$(XDG_APP_BINDIR)\" \ + -DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \ -DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/xdg-app\"\ - -DFLATPAK_CONFIGDIR=\"$(sysconfdir)/xdg-app\"\ + -DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\"\ -DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \ -DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \ -DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \ -DHELPER=\"$(libdir)/flatpak/bwrap\" \ - -DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\" \ + -DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\" \ -DG_LOG_DOMAIN=\"flatpak\" \ -I$(srcdir)/libglnx \ -I$(srcdir)/common \ @@ -94,26 +94,26 @@ endif endif completiondir = $(datadir)/bash-completion/completions -completion_DATA = completion/xdg-app +completion_DATA = completion/flatpak EXTRA_DIST += $(completion_DATA) profiledir = $(sysconfdir)/profile.d -profile_DATA = xdg-app.sh +profile_DATA = flatpak.sh EXTRA_DIST += \ - profile/xdg-app.sh.in \ + profile/flatpak.sh.in \ $(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)|" \ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ envdir = $(datadir)/gdm/env.d -env_DATA = xdg-app.env -EXTRA_DIST += env.d/xdg-app.env.in -DISTCLEANFILES += xdg-app.env +env_DATA = flatpak.env +EXTRA_DIST += env.d/flatpak.env.in +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)|" \ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ diff --git a/README.md b/README.md index 84c26676..84d72ac3 100644 --- a/README.md +++ b/README.md @@ -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. See https://wiki.gnome.org/Projects/SandboxedApps for more information. diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc index 19cbd6eb..fa678ce0 100644 --- a/app/Makefile.am.inc +++ b/app/Makefile.am.inc @@ -1,8 +1,8 @@ bin_PROGRAMS += \ - xdg-app \ + flatpak \ $(NULL) -xdg_app_SOURCES = \ +flatpak_SOURCES = \ app/flatpak-main.c \ app/flatpak-builtins.h \ app/flatpak-builtins-add-remote.c \ @@ -30,5 +30,5 @@ xdg_app_SOURCES = \ $(xdp_dbus_built_sources) \ $(NULL) -xdg_app_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_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la +flatpak_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS) diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c index bdc7e9e1..cc99843e 100644 --- a/app/flatpak-builtins-build-bundle.c +++ b/app/flatpak-builtins-build-bundle.c @@ -50,7 +50,7 @@ static GOptionEntry options[] = { { "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" }, { "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 } }; @@ -132,7 +132,7 @@ build_bundle (OstreeRepo *repo, GFile *file, * later. Furthermore, the use of an uint32 lets use detect * 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_builder_add (&metadata_builder, "{sv}", "ref", g_variant_new_string (full_branch)); @@ -180,7 +180,7 @@ build_bundle (OstreeRepo *repo, GFile *file, int i; g_autoptr(GFile) icons_dir = 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_key[] = { "icon-64", "icon-128" }; g_autofree char *icon_name = g_strconcat (name, ".png", NULL); @@ -749,7 +749,7 @@ build_oci (OstreeRepo *repo, GFile *file, return FALSE; #elif !defined(HAVE_LIBARCHIVE) 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; #else struct free_write_archive archive *a = NULL; @@ -876,7 +876,7 @@ build_oci (OstreeRepo *repo, GFile *file, if (archive_write_close (a) != ARCHIVE_OK) 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"); return TRUE; diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c index 5312a899..b7e0d7e8 100644 --- a/app/flatpak-builtins-build-import-bundle.c +++ b/app/flatpak-builtins-build-import-bundle.c @@ -36,7 +36,7 @@ static gboolean opt_oci = FALSE; static GOptionEntry options[] = { { "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 } }; @@ -52,7 +52,7 @@ import_oci (OstreeRepo *repo, GFile *file, return FALSE; #elif !defined(HAVE_LIBARCHIVE) 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; #else g_autoptr(OstreeMutableTree) archive_mtree = NULL; diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc index 1f560d5c..b1f71170 100644 --- a/builder/Makefile.am.inc +++ b/builder/Makefile.am.inc @@ -1,8 +1,8 @@ bin_PROGRAMS += \ - xdg-app-builder \ + flatpak-builder \ $(NULL) -xdg_app_builder_SOURCES = \ +flatpak_builder_SOURCES = \ builder/builder-main.c \ builder/builder-manifest.c \ builder/builder-manifest.h \ @@ -34,6 +34,6 @@ xdg_app_builder_SOURCES = \ builder/builder-utils.h \ $(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 -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) diff --git a/builder/builder-context.c b/builder/builder-context.c index f0e127dc..afc5bc94 100644 --- a/builder/builder-context.c +++ b/builder/builder-context.c @@ -137,7 +137,7 @@ builder_context_constructed (GObject *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->build_dir = g_file_get_child (self->state_dir, "build"); 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; - 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_USE_THREAD_CONTEXT, TRUE, SOUP_SESSION_TIMEOUT, 60, @@ -391,7 +391,7 @@ builder_context_extend_env (BuilderContext *self, const char *old_path = g_environ_getenv (envp, "PATH"); g_autofree char *new_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); envp = g_environ_setenv (envp, "PATH", new_path, TRUE); diff --git a/builder/builder-main.c b/builder/builder-main.c index 41c5e18a..512859c4 100644 --- a/builder/builder-main.c +++ b/builder/builder-main.c @@ -112,7 +112,7 @@ do_export (BuilderContext *build_context, g_autoptr(GSubprocess) subp = NULL; 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_printf ("--arch=%s", builder_context_get_arch (build_context))); diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index 95ae42b8..986f7ef8 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -818,7 +818,7 @@ builder_manifest_get_branch (BuilderManifest *self) } static char * -xdg_app (GError **error, +flatpak (GError **error, ...) { gboolean res; @@ -826,7 +826,7 @@ xdg_app (GError **error, va_list ap; va_start (ap, error); - res = flatpak_spawn (NULL, &output, error, "xdg-app", ap); + res = flatpak_spawn (NULL, &output, error, "flatpak", ap); va_end (ap); if (res) @@ -846,14 +846,14 @@ builder_manifest_start (BuilderManifest *self, 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); if (self->sdk_commit == NULL) return flatpak_fail (error, "Unable to find sdk %s version %s", self->sdk, 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); if (self->runtime_commit == NULL) 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); - 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")); if (self->writable_sdk || self->build_runtime) { @@ -1129,7 +1129,7 @@ command (GFile *app_dir, int i; 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 ("--nofilesystem=host")); @@ -1306,7 +1306,7 @@ appstream_compose (GFile *app_dir, va_list ap; 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 ("--nofilesystem=host")); 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"); if (!appstream_compose (app_dir, error, self->build_runtime ? "--prefix=/usr" : "--prefix=/app", - "--origin=xdg-app", + "--origin=flatpak", basename_arg, self->id, NULL)) @@ -1605,7 +1605,7 @@ builder_manifest_finish (BuilderManifest *self, } 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")); if (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); - 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 ("--update")); g_ptr_array_add (args, g_strdup ("--writable-sdk")); @@ -1985,7 +1985,7 @@ builder_manifest_run (BuilderManifest *self, return FALSE; 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")); 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)) { - 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; } diff --git a/builder/builder-module.c b/builder/builder-module.c index 178b071b..2ba5c370 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -583,7 +583,7 @@ build (GFile *app_dir, int i; 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")); source_dir_path_canonical = canonicalize_file_name (source_dir_path); diff --git a/builder/builder-source-shell.c b/builder/builder-source-shell.c index e9ebcbb4..29022581 100644 --- a/builder/builder-source-shell.c +++ b/builder/builder-source-shell.c @@ -126,7 +126,7 @@ run_script (BuilderContext *context, g_autofree char *source_dir_path_canonical = NULL; 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")); source_dir_path_canonical = canonicalize_file_name (source_dir_path); diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc index a10e59ef..06d676d9 100644 --- a/common/Makefile.am.inc +++ b/common/Makefile.am.inc @@ -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 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) \ - --interface-prefix org.freedesktop.XdgApp. \ + --interface-prefix org.freedesktop.Flatpak. \ --c-namespace Flatpak \ --generate-c-code $(builddir)/common/flatpak-dbus \ - $(srcdir)/data/org.freedesktop.XdgApp.xml \ + $(srcdir)/data/org.freedesktop.Flatpak.xml \ $(NULL) $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml diff --git a/common/flatpak-db.c b/common/flatpak-db.c index 429700db..f20443ed 100644 --- a/common/flatpak-db.c +++ b/common/flatpak-db.c @@ -1,4 +1,4 @@ -/* xdg-app-db.c +/* flatpak-db.c * * Copyright (C) 2015 Red Hat, Inc * diff --git a/common/flatpak-db.h b/common/flatpak-db.h index 738cf9bd..f7757854 100644 --- a/common/flatpak-db.h +++ b/common/flatpak-db.h @@ -1,4 +1,4 @@ -/* xdg-app-db.h +/* flatpak-db.h * * Copyright © 2015 Red Hat, Inc * diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 1aac10cc..c4bbfe33 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -37,19 +37,19 @@ #include "errno.h" -#define NO_SYSTEM_HELPER ((XdgAppSystemHelper *) (gpointer) 1) +#define NO_SYSTEM_HELPER ((FlatpakSystemHelper *) (gpointer) 1) struct FlatpakDir { - GObject parent; + GObject parent; - gboolean user; - GFile *basedir; - OstreeRepo *repo; + gboolean user; + GFile *basedir; + OstreeRepo *repo; - XdgAppSystemHelper *system_helper; + FlatpakSystemHelper *system_helper; - SoupSession *soup_session; + SoupSession *soup_session; }; typedef struct @@ -75,7 +75,7 @@ typedef struct G_DEFINE_TYPE (FlatpakDir, flatpak_dir, 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 { PROP_0, @@ -199,16 +199,16 @@ flatpak_ensure_user_cache_dir_location (GError **error) return g_steal_pointer (&cache_dir); } -static XdgAppSystemHelper * +static FlatpakSystemHelper * flatpak_dir_get_system_helper (FlatpakDir *self) { g_autoptr(GError) error = NULL; if (g_once_init_enter (&self->system_helper)) { - XdgAppSystemHelper *system_helper; + FlatpakSystemHelper *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_CONNECT_SIGNALS, "org.freedesktop.Flatpak.SystemHelper", @@ -231,7 +231,7 @@ flatpak_dir_get_system_helper (FlatpakDir *self) gboolean flatpak_dir_use_child_repo (FlatpakDir *self) { - XdgAppSystemHelper *system_helper; + FlatpakSystemHelper *system_helper; if (self->user || getuid () == 0) 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 * 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); 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); 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_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT; char *empty_subpaths[] = {NULL}; - XdgAppSystemHelper *system_helper; + FlatpakSystemHelper *system_helper; if (no_pull) return flatpak_fail (error, "No-pull install not supported without root permissions"); @@ -2889,7 +2889,7 @@ flatpak_dir_install (FlatpakDir *self, progress, cancellable, error)) 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)), FLATPAK_HELPER_DEPLOY_FLAGS_NONE, ref, @@ -2943,7 +2943,7 @@ flatpak_dir_update (FlatpakDir *self, char *empty_subpaths[] = {NULL}; g_autofree char *pulled_checksum = NULL; g_autofree char *active_checksum = NULL; - XdgAppSystemHelper *system_helper; + FlatpakSystemHelper *system_helper; if (no_pull) 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 (!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)), FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE, ref, diff --git a/common/flatpak-portal-error.c b/common/flatpak-portal-error.c index 7672f0f5..0d183438 100644 --- a/common/flatpak-portal-error.c +++ b/common/flatpak-portal-error.c @@ -1,4 +1,4 @@ -/* xdg-app-error.c +/* flatpak-error.c * * Copyright (C) 2015 Red Hat, Inc * @@ -40,7 +40,7 @@ flatpak_portal_error_quark (void) { 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, flatpak_error_entries, G_N_ELEMENTS (flatpak_error_entries)); diff --git a/common/flatpak-portal-error.h b/common/flatpak-portal-error.h index 2ff02e8f..14afad92 100644 --- a/common/flatpak-portal-error.h +++ b/common/flatpak-portal-error.h @@ -1,4 +1,4 @@ -/* xdg-app-error.c +/* flatpak-portal-error.c * * Copyright (C) 2015 Red Hat, Inc * diff --git a/common/flatpak-run.c b/common/flatpak-run.c index ff4eb376..388aef99 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -1318,7 +1318,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array, #ifdef ENABLE_XAUTH 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) { FILE *output = fdopen (fd, "wb"); @@ -1795,7 +1795,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array, g_autofree char *path = NULL; 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) { close (fd); @@ -2087,7 +2087,7 @@ flatpak_run_in_transient_unit (const char *appid, GError **error) if (!manager) 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)")); @@ -2202,14 +2202,14 @@ add_app_info_args (GPtrArray *argv_array, g_autofree char *tmp_path = NULL; 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) { g_autoptr(GKeyFile) keyfile = NULL; g_autoptr(GFile) files = NULL; g_autofree char *files_path = 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); @@ -2247,17 +2247,17 @@ static void add_monitor_path_args (GPtrArray *argv_array, char ***envp_p) { - g_autoptr(AutoXdgAppSessionHelper) session_helper = NULL; + g_autoptr(AutoFlatpakSessionHelper) session_helper = NULL; g_autofree char *monitor_path = NULL; 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, "org.freedesktop.Flatpak", "/org/freedesktop/Flatpak/SessionHelper", NULL, NULL); if (session_helper && - xdg_app_session_helper_call_request_monitor_sync (session_helper, + flatpak_session_helper_call_request_monitor_sync (session_helper, &monitor_path, NULL, NULL)) { @@ -2545,7 +2545,7 @@ setup_seccomp (GPtrArray *argv_array, /* This *adds* the target arch, instead of replacing the native one. This is not ideal, because we'd like to only 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. */ r = seccomp_arch_add (seccomp, arch_id); 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)); } - fd = g_file_open_tmp ("xdg-app-seccomp-XXXXXX", &path, error); + fd = g_file_open_tmp ("flatpak-seccomp-XXXXXX", &path, error); if (fd == -1) return FALSE; @@ -2969,7 +2969,7 @@ flatpak_run_app (const char *app_ref, close (sync_fds[1]); 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", "/usr/lib/debug/source", "/run/build-runtime", NULL); diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index dbe2f990..fca297ab 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -1023,10 +1023,10 @@ got_credentials_cb (GObject *source_object, const char *unit = lines[i] + strlen ("1:name=systemd:"); 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")) { - const char *name = scope + strlen ("xdg-app-"); + const char *name = scope + strlen ("flatpak-"); char *dash = strchr (name, '-'); if (dash != NULL) { @@ -1532,9 +1532,9 @@ flatpak_repo_set_title (OstreeRepo *repo, config = ostree_repo_copy_config (repo); if (title) - g_key_file_set_string (config, "xdg-app", "title", title); + g_key_file_set_string (config, "flatpak", "title", title); 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)) return FALSE; @@ -1633,7 +1633,7 @@ flatpak_repo_update (OstreeRepo *repo, config = ostree_repo_get_config (repo); 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) 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_values = g_new0 (char *, 2 * 4); bundle->attribute_names[0] = g_strdup ("type"); - bundle->attribute_values[0] = g_strdup ("xdg-app"); + bundle->attribute_values[0] = g_strdup ("flatpak"); i = 1; if (runtime) @@ -1905,7 +1905,7 @@ copy_icon (const char *id, g_autoptr(GFile) icons_dir = 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) icon_file = g_file_get_child (size_dir, icon_name); 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_values[0] = g_strdup ("0.8"); 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; } @@ -2124,7 +2124,7 @@ flatpak_repo_generate_appstream (OstreeRepo *repo, { GHashTableIter iter2; 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(GFile) appstream_file = NULL; g_autoptr(GFile) root = NULL; diff --git a/common/flatpak-utils.h b/common/flatpak-utils.h index 71870152..8f3ab922 100644 --- a/common/flatpak-utils.h +++ b/common/flatpak-utils.h @@ -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: * https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59 */ -typedef XdgAppSessionHelper AutoXdgAppSessionHelper; -G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoXdgAppSessionHelper, g_object_unref) +typedef FlatpakSessionHelper AutoFlatpakSessionHelper; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoFlatpakSessionHelper, g_object_unref) typedef struct FlatpakXml FlatpakXml; diff --git a/completion/xdg-app b/completion/flatpak similarity index 95% rename from completion/xdg-app rename to completion/flatpak index b59d8f02..42fbaaf5 100755 --- a/completion/xdg-app +++ b/completion/flatpak @@ -7,7 +7,7 @@ __contains_word () { done } -_xdg-app() { +_flatpak() { local cur prev local cur=${COMP_WORDS[COMP_CWORD]} local prev=${COMP_WORDS[COMP_CWORD-1]} @@ -122,13 +122,13 @@ _xdg-app() { comps=$(compgen -A command) ;; --var) - comps=$(xdg-app $mode list --runtime) + comps=$(flatpak $mode list --runtime) ;; --runtime) if __contains_word "$verb" ${VERBS[KIND]}; then comps=XXX else - comps=$(xdg-app $mode list --runtime) + comps=$(flatpak $mode list --runtime) fi ;; --share|--noshare) @@ -287,7 +287,7 @@ _xdg-app() { else case "$verb" in remote-add|remote-modify|remote-delete|remote-ls) - comps=$(xdg-app $mode remote-list) + comps=$(flatpak $mode remote-list) ;; install) @@ -296,12 +296,12 @@ _xdg-app() { compopt -o filenames else if [[ -z $remote ]]; then - comps=$(xdg-app $mode remote-list) + comps=$(flatpak $mode remote-list) if [[ $mode == "--system" ]]; then comps="$comps --user" fi elif [[ -z $name ]]; then - comps=$(xdg-app remote-ls $mode $kind $remote) + comps=$(flatpak remote-ls $mode $kind $remote) else comps='' # FIXME: branches fi @@ -314,7 +314,7 @@ _xdg-app() { update|uninstall) if [[ -z $name ]]; then - comps=$(xdg-app $mode $kind list) + comps=$(flatpak $mode $kind list) else comps='' # FIXME: branches fi @@ -323,7 +323,7 @@ _xdg-app() { run|override) # run doesn't take --user or --system, so don't use mode here if [[ -z $name ]]; then - comps=$(xdg-app list --app) + comps=$(flatpak list --app) fi ;; @@ -333,9 +333,9 @@ _xdg-app() { comps='' compopt -o dirnames 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 - comps="$(xdg-app list --runtime) $(xdg-app --user list --runtime)" + comps="$(flatpak list --runtime) $(flatpak --user list --runtime)" else comps='' # FIXME: branches fi @@ -402,4 +402,4 @@ _xdg-app() { return 0 } -complete -F _xdg-app xdg-app +complete -F _flatpak flatpak diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc index a47819b0..bf11ca46 100644 --- a/data/Makefile.am.inc +++ b/data/Makefile.am.inc @@ -1,11 +1,11 @@ introspectiondir = $(datadir)/dbus-1/interfaces introspection_DATA = \ data/org.freedesktop.portal.Documents.xml \ - data/org.freedesktop.XdgApp.xml \ + data/org.freedesktop.Flatpak.xml \ $(NULL) EXTRA_DIST += \ data/org.freedesktop.portal.Documents.xml \ data/org.freedesktop.systemd1.xml \ - data/org.freedesktop.XdgApp.xml \ + data/org.freedesktop.Flatpak.xml \ $(NULL) diff --git a/data/org.freedesktop.XdgApp.xml b/data/org.freedesktop.Flatpak.xml similarity index 94% rename from data/org.freedesktop.XdgApp.xml rename to data/org.freedesktop.Flatpak.xml index d90a6e0a..e9726c5a 100644 --- a/data/org.freedesktop.XdgApp.xml +++ b/data/org.freedesktop.Flatpak.xml @@ -24,14 +24,14 @@ --> - + - + @@ -82,7 +82,7 @@ - + diff --git a/dbus-proxy/Makefile.am.inc b/dbus-proxy/Makefile.am.inc index 6cf49475..a62c48f6 100644 --- a/dbus-proxy/Makefile.am.inc +++ b/dbus-proxy/Makefile.am.inc @@ -1,12 +1,12 @@ libexec_PROGRAMS += \ - xdg-dbus-proxy \ + flatpak-dbus-proxy \ $(NULL) -xdg_dbus_proxy_SOURCES = \ +flatpak_dbus_proxy_SOURCES = \ dbus-proxy/flatpak-proxy.c \ dbus-proxy/flatpak-proxy.h \ - dbus-proxy/dbus-proxy.c \ + dbus-proxy/dbus-proxy.c \ $(NULL) -xdg_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la -xdg_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy +flatpak_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la +flatpak_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy diff --git a/doc/Makefile.am b/doc/Makefile.am index 6d70e236..6d6f8c25 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,31 +15,31 @@ XSLTPROC_FLAGS = \ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< man_MANS = \ - xdg-app.1 \ - xdg-app-remote-add.1 \ - xdg-app-remote-delete.1 \ - xdg-app-remote-list.1 \ - xdg-app-remote-modify.1 \ - xdg-app-remote-ls.1 \ - xdg-app-install.1 \ - xdg-app-update.1 \ - xdg-app-uninstall.1 \ - xdg-app-list.1 \ - xdg-app-info.1 \ - xdg-app-make-current.1 \ - xdg-app-run.1 \ - xdg-app-override.1 \ - xdg-app-enter.1 \ - xdg-app-export-file.1 \ - xdg-app-build-init.1 \ - xdg-app-build.1 \ - xdg-app-build-bundle.1 \ - xdg-app-build-import-bundle.1 \ - xdg-app-build-finish.1 \ - xdg-app-build-export.1 \ - xdg-app-build-update-repo.1 \ - xdg-app-build-sign.1 \ - xdg-app-builder.1 \ + flatpak.1 \ + flatpak-remote-add.1 \ + flatpak-remote-delete.1 \ + flatpak-remote-list.1 \ + flatpak-remote-modify.1 \ + flatpak-remote-ls.1 \ + flatpak-install.1 \ + flatpak-update.1 \ + flatpak-uninstall.1 \ + flatpak-list.1 \ + flatpak-info.1 \ + flatpak-make-current.1 \ + flatpak-run.1 \ + flatpak-override.1 \ + flatpak-enter.1 \ + flatpak-export-file.1 \ + flatpak-build-init.1 \ + flatpak-build.1 \ + flatpak-build-bundle.1 \ + flatpak-build-import-bundle.1 \ + flatpak-build-finish.1 \ + flatpak-build-export.1 \ + flatpak-build-update-repo.1 \ + flatpak-build-sign.1 \ + flatpak-builder.1 \ $(NULL) xml_files = $(man_MANS:.1=.xml) diff --git a/doc/xdg-app-build-bundle.xml b/doc/flatpak-build-bundle.xml similarity index 86% rename from doc/xdg-app-build-bundle.xml rename to doc/flatpak-build-bundle.xml index bac719f8..248356d6 100644 --- a/doc/xdg-app-build-bundle.xml +++ b/doc/flatpak-build-bundle.xml @@ -2,11 +2,11 @@ - + - xdg-app build-bundle - xdg-app + flatpak build-bundle + flatpak @@ -19,18 +19,18 @@ - xdg-app build-bundle + flatpak build-bundle 1 - xdg-app-build-bundle + flatpak-build-bundle Create a single file bundle from a local repository - xdg-app build-bundle + flatpak build-bundle OPTION LOCATION FILENAME @@ -51,7 +51,7 @@ 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. @@ -138,12 +138,12 @@ ostree1, - xdg-app1, - xdg-app-build-init1, - xdg-app-build1, - xdg-app-build-finish1, - xdg-app-build-import-bundle1, - xdg-app-repo-update1 + flatpak1, + flatpak-build-init1, + flatpak-build1, + flatpak-build-finish1, + flatpak-build-import-bundle1, + flatpak-repo-update1 diff --git a/doc/xdg-app-build-export.xml b/doc/flatpak-build-export.xml similarity index 91% rename from doc/xdg-app-build-export.xml rename to doc/flatpak-build-export.xml index 5b32a313..7aa80db3 100644 --- a/doc/xdg-app-build-export.xml +++ b/doc/flatpak-build-export.xml @@ -2,11 +2,11 @@ - + - xdg-app build-export - xdg-app + flatpak build-export + flatpak @@ -19,18 +19,18 @@ - xdg-app build-export + flatpak build-export 1 - xdg-app-build-export + flatpak-build-export Create a repository from a build directory - xdg-app build-export + flatpak build-export OPTION LOCATION DIRECTORY @@ -201,7 +201,7 @@ Examples - $ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator + $ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c @@ -219,12 +219,12 @@ Content Bytes Written: 305 ostree1, - xdg-app1, - xdg-app-build-init1, - xdg-app-build1, - xdg-app-build-finish1 - xdg-app-build-sign1 - xdg-app-repo-update1 + flatpak1, + flatpak-build-init1, + flatpak-build1, + flatpak-build-finish1 + flatpak-build-sign1 + flatpak-repo-update1 diff --git a/doc/xdg-app-build-finish.xml b/doc/flatpak-build-finish.xml similarity index 94% rename from doc/xdg-app-build-finish.xml rename to doc/flatpak-build-finish.xml index 6d747613..7581c477 100644 --- a/doc/xdg-app-build-finish.xml +++ b/doc/flatpak-build-finish.xml @@ -2,11 +2,11 @@ - + - xdg-app build-finish - xdg-app + flatpak build-finish + flatpak @@ -19,18 +19,18 @@ - xdg-app build-finish + flatpak build-finish 1 - xdg-app-build-finish + flatpak-build-finish Finalize a build directory - xdg-app build-finish + flatpak build-finish OPTION DIRECTORY @@ -265,7 +265,7 @@ Examples - $ xdg-app build-finish /build/my-app --socket=x11 --share=ipc + $ flatpak build-finish /build/my-app --socket=x11 --share=ipc Exporting share/applications/gnome-calculator.desktop @@ -281,10 +281,10 @@ Please review the exported files and the metadata See also - xdg-app1, - xdg-app-build-init1, - xdg-app-build1, - xdg-app-build-export1 + flatpak1, + flatpak-build-init1, + flatpak-build1, + flatpak-build-export1 diff --git a/doc/xdg-app-build-import-bundle.xml b/doc/flatpak-build-import-bundle.xml similarity index 84% rename from doc/xdg-app-build-import-bundle.xml rename to doc/flatpak-build-import-bundle.xml index 6634ab66..02a8afeb 100644 --- a/doc/xdg-app-build-import-bundle.xml +++ b/doc/flatpak-build-import-bundle.xml @@ -2,11 +2,11 @@ - + - xdg-app build-import-bundle - xdg-app + flatpak build-import-bundle + flatpak @@ -19,18 +19,18 @@ - xdg-app build-import-bundle + flatpak build-import-bundle 1 - xdg-app-build-import-bundle + flatpak-build-import-bundle Import a file bundle into a local repository - xdg-app build-import-bundle + flatpak build-import-bundle OPTION LOCATION FILENAME @@ -96,9 +96,9 @@ ostree1, - xdg-app1, - xdg-app-build-bundle1, - xdg-app-repo-update1 + flatpak1, + flatpak-build-bundle1, + flatpak-repo-update1 diff --git a/doc/xdg-app-build-init.xml b/doc/flatpak-build-init.xml similarity index 89% rename from doc/xdg-app-build-init.xml rename to doc/flatpak-build-init.xml index 63035e8c..cbd43fa0 100644 --- a/doc/xdg-app-build-init.xml +++ b/doc/flatpak-build-init.xml @@ -2,11 +2,11 @@ - + - xdg-app build-init - xdg-app + flatpak build-init + flatpak @@ -19,18 +19,18 @@ - xdg-app build-init + flatpak build-init 1 - xdg-app-build-init + flatpak-build-init Initialize a build directory - xdg-app build-init + flatpak build-init OPTION DIRECTORY APPNAME @@ -101,7 +101,7 @@ - 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 usr subdirectory of the app dir, but will not be part of the final app. @@ -162,7 +162,7 @@ Examples - $ xdg-app build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16 + $ flatpak build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16 @@ -171,10 +171,10 @@ See also - xdg-app1, - xdg-app-build1, - xdg-app-build-finish1, - xdg-app-build-export1 + flatpak1, + flatpak-build1, + flatpak-build-finish1, + flatpak-build-export1 diff --git a/doc/xdg-app-build-sign.xml b/doc/flatpak-build-sign.xml similarity index 88% rename from doc/xdg-app-build-sign.xml rename to doc/flatpak-build-sign.xml index 4a6a5e39..ad8da8f7 100644 --- a/doc/xdg-app-build-sign.xml +++ b/doc/flatpak-build-sign.xml @@ -2,11 +2,11 @@ - + - xdg-app build-sign - xdg-app + flatpak build-sign + flatpak @@ -19,18 +19,18 @@ - xdg-app build-sign + flatpak build-sign 1 - xdg-app-build-sign + flatpak-build-sign Sign an application or runtime - xdg-app build-sign + flatpak build-sign OPTION LOCATION ID @@ -126,7 +126,7 @@ Examples - $ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator + $ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c @@ -144,9 +144,9 @@ Content Bytes Written: 305 ostree1, - xdg-app1, - xdg-app-build-export1, - xdg-app-build1, + flatpak1, + flatpak-build-export1, + flatpak-build1, diff --git a/doc/xdg-app-build-update-repo.xml b/doc/flatpak-build-update-repo.xml similarity index 87% rename from doc/xdg-app-build-update-repo.xml rename to doc/flatpak-build-update-repo.xml index 09dd4751..1de2eff1 100644 --- a/doc/xdg-app-build-update-repo.xml +++ b/doc/flatpak-build-update-repo.xml @@ -2,11 +2,11 @@ - + - xdg-app build-update-repo - xdg-app + flatpak build-update-repo + flatpak @@ -19,18 +19,18 @@ - xdg-app build-update-repo + flatpak build-update-repo 1 - xdg-app-build-update-repo + flatpak-build-update-repo Create a repository from a build directory - xdg-app build-update-repo + flatpak build-update-repo OPTION LOCATION @@ -43,12 +43,12 @@ Updates repository metadata for the repository at LOCATION. This command generates 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. After this command, LOCATION 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. @@ -142,9 +142,9 @@ ostree1, - xdg-app1, - xdg-app-repo-contents1, - xdg-app-build-export1 + flatpak1, + flatpak-repo-contents1, + flatpak-build-export1 diff --git a/doc/xdg-app-build.xml b/doc/flatpak-build.xml similarity index 93% rename from doc/xdg-app-build.xml rename to doc/flatpak-build.xml index cb95c7ae..e6abfce3 100644 --- a/doc/xdg-app-build.xml +++ b/doc/flatpak-build.xml @@ -2,11 +2,11 @@ - + - xdg-app build - xdg-app + flatpak build + flatpak @@ -19,18 +19,18 @@ - xdg-app build + flatpak build 1 - xdg-app-build + flatpak-build Build in a directory - xdg-app build + flatpak build OPTION DIRECTORY COMMAND ARG @@ -42,7 +42,7 @@ Runs a build command in a directory. DIRECTORY - must have been initialized with xdg-app build-init. + must have been initialized with flatpak build-init. The sdk that is specfied in the metadata file @@ -222,7 +222,7 @@ Examples - $ xdg-app build /build/my-app rpmbuild my-app.src.rpm + $ flatpak build /build/my-app rpmbuild my-app.src.rpm @@ -231,10 +231,10 @@ See also - xdg-app1, - xdg-app-build-init1, - xdg-app-build-finish1, - xdg-app-build-export1 + flatpak1, + flatpak-build-init1, + flatpak-build-finish1, + flatpak-build-export1 diff --git a/doc/xdg-app-builder.xml b/doc/flatpak-builder.xml similarity index 95% rename from doc/xdg-app-builder.xml rename to doc/flatpak-builder.xml index 4e1d64d1..592e514b 100644 --- a/doc/xdg-app-builder.xml +++ b/doc/flatpak-builder.xml @@ -2,11 +2,11 @@ - + - xdg-app builder - xdg-app + flatpak builder + flatpak @@ -19,24 +19,24 @@ - xdg-app-builder + flatpak-builder 1 - xdg-app-builder + flatpak-builder Help build application dependencies - xdg-app-builder + flatpak-builder OPTION DIRECTORY MANIFEST - xdg-app-builder + flatpak-builder --run OPTION DIRECTORY @@ -49,46 +49,46 @@ Description - xdg-app-builder is a wrapper around the xdg-app build command + flatpak-builder is a wrapper around the flatpak build command that automates the building of applications and their dependencies. It is one option you can use to build applications. - The goal of xdg-app-builder is to push as much knowledge about how to build modules to + The goal of flatpak-builder 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 at https://github.com/cgwalters/build-api. This essentially means that it follows the ./configure && make && make install 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. - An invocation of xdg-app-builder proceeds in these stages, each being specified + An invocation of flatpak-builder proceeds in these stages, each being specified in detail in json format in MANIFEST: Download all sources - Initialize the application directory with xdg-app build-init + Initialize the application directory with flatpak build-init - Build and install each module with xdg-app build + Build and install each module with flatpak build Clean up the final build tree by removing unwanted files and e.g. stripping binaries - Finish the application directory with xdg-app build-finish + Finish the application directory with flatpak build-finish After this you will end up with a build of the application in DIRECTORY, which you can - export to a repository with the xdg-app build-export command. + export to a repository with the flatpak build-export command. - 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 new commits added, or the first module where some changes to the MANIFEST 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. @@ -196,7 +196,7 @@ (array of strings) - An array of arguments passed to the xdg-app build-finish command. + An array of arguments passed to the flatpak build-finish command. (string) @@ -254,7 +254,7 @@ (array of strings) - This is an array containing extra options to pass to xdg-app build. + This is an array containing extra options to pass to flatpak build. (boolean) @@ -588,10 +588,10 @@ - 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 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. @@ -701,14 +701,14 @@ Caching - xdg-app-builder caches sources and partial build results in - the .xdg-app-builder subdirectory of the current directory. If you + flatpak-builder caches sources and partial build results in + the .flatpak-builder subdirectory of the current directory. If you use , build directories for each module are also stored here. - 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. @@ -718,7 +718,7 @@ Examples - $ xdg-app-builder my-app-dir manifest.json + $ flatpak-builder my-app-dir manifest.json @@ -795,11 +795,11 @@ See also - xdg-app1, - xdg-app-build-init1, - xdg-app-build-build1, - xdg-app-build-finish1, - xdg-app-build-export1 + flatpak1, + flatpak-build-init1, + flatpak-build-build1, + flatpak-build-finish1, + flatpak-build-export1 diff --git a/doc/xdg-app-enter.xml b/doc/flatpak-enter.xml similarity index 86% rename from doc/xdg-app-enter.xml rename to doc/flatpak-enter.xml index e0f6a129..9dd1d94a 100644 --- a/doc/xdg-app-enter.xml +++ b/doc/flatpak-enter.xml @@ -2,11 +2,11 @@ - + - xdg-app enter - xdg-app + flatpak enter + flatpak @@ -19,18 +19,18 @@ - xdg-app enter + flatpak enter 1 - xdg-app-enter + flatpak-enter Enter an application - xdg-app enter + flatpak enter OPTION MONITORPID COMMAND @@ -92,7 +92,7 @@ Examples - $ xdg-app enter 15345 sh + $ flatpak enter 15345 sh @@ -101,8 +101,8 @@ See also - xdg-app1 - xdg-app-run1 + flatpak1 + flatpak-run1 diff --git a/doc/xdg-app-export-file.xml b/doc/flatpak-export-file.xml similarity index 90% rename from doc/xdg-app-export-file.xml rename to doc/flatpak-export-file.xml index 7c10e1bc..057e58cf 100644 --- a/doc/xdg-app-export-file.xml +++ b/doc/flatpak-export-file.xml @@ -2,11 +2,11 @@ - + - xdg-app export-file - xdg-app + flatpak export-file + flatpak @@ -19,18 +19,18 @@ - xdg-app export-file + flatpak export-file 1 - xdg-app-export-file + flatpak-export-file Export a file to a sandboxed application - xdg-app export-file + flatpak export-file OPTION FILE @@ -141,7 +141,7 @@ Examples - $ xdg-app export-file --app=org.gnome.GEdit ~/test.txt + $ flatpak export-file --app=org.gnome.GEdit ~/test.txt /run/user/1000/doc/e52f9c6a/test.txt @@ -153,8 +153,8 @@ See also - xdg-app1 - xdg-app-run1 + flatpak1 + flatpak-run1 diff --git a/doc/xdg-app-info.xml b/doc/flatpak-info.xml similarity index 90% rename from doc/xdg-app-info.xml rename to doc/flatpak-info.xml index 494a54b9..bcd454c7 100644 --- a/doc/xdg-app-info.xml +++ b/doc/flatpak-info.xml @@ -2,11 +2,11 @@ - + - xdg-app info - xdg-app + flatpak info + flatpak @@ -19,18 +19,18 @@ - xdg-app info + flatpak info 1 - xdg-app-info + flatpak-info Show information about installed application and/or runtime - xdg-app info + flatpak info OPTION NAME BRANCH @@ -152,7 +152,7 @@ Examples - $ xdg-app --user list + $ flatpak --user list org.gnome.Builder @@ -167,9 +167,9 @@ org.gnome.GEdit See also - xdg-app1, - xdg-app-install-app1, - xdg-app-update-app1 + flatpak1, + flatpak-install-app1, + flatpak-update-app1 diff --git a/doc/xdg-app-install.xml b/doc/flatpak-install.xml similarity index 89% rename from doc/xdg-app-install.xml rename to doc/flatpak-install.xml index bb8c6d6a..bf8ae011 100644 --- a/doc/xdg-app-install.xml +++ b/doc/flatpak-install.xml @@ -2,11 +2,11 @@ - + - xdg-app install - xdg-app + flatpak install + flatpak @@ -19,25 +19,25 @@ - xdg-app install + flatpak install 1 - xdg-app-install + flatpak-install Install an application or runtime - xdg-app install + flatpak install OPTION REMOTE NAME BRANCH - xdg-app install + flatpak install OPTION --bundle FILENAME @@ -58,7 +58,7 @@ the specified REMOTE, but you can limit this by using the --app or --runtime option. - 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, meaning its exported files (for instance desktop files and icons) are visible to the host. The last installed version is made current by @@ -71,7 +71,7 @@ The alternative form of the command installs an application from a 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. @@ -195,7 +195,7 @@ Examples - $ xdg-app --user install test-repo org.gnome.GEdit + $ flatpak --user install test-repo org.gnome.GEdit @@ -204,10 +204,10 @@ See also - xdg-app1, - xdg-app-update-app1, - xdg-app-list-apps1, - xdg-app-build-bundle1 + flatpak1, + flatpak-update-app1, + flatpak-list-apps1, + flatpak-build-bundle1 diff --git a/doc/xdg-app-list.xml b/doc/flatpak-list.xml similarity index 88% rename from doc/xdg-app-list.xml rename to doc/flatpak-list.xml index 001b0923..57743194 100644 --- a/doc/xdg-app-list.xml +++ b/doc/flatpak-list.xml @@ -2,11 +2,11 @@ - + - xdg-app list - xdg-app + flatpak list + flatpak @@ -19,18 +19,18 @@ - xdg-app list + flatpak list 1 - xdg-app-list + flatpak-list List installed applications and/or runtimes - xdg-app list + flatpak list OPTION @@ -130,7 +130,7 @@ Examples - $ xdg-app --user list + $ flatpak --user list org.gnome.Builder @@ -145,9 +145,9 @@ org.gnome.GEdit See also - xdg-app1, - xdg-app-install-app1, - xdg-app-update-app1 + flatpak1, + flatpak-install-app1, + flatpak-update-app1 diff --git a/doc/xdg-app-make-current.xml b/doc/flatpak-make-current.xml similarity index 86% rename from doc/xdg-app-make-current.xml rename to doc/flatpak-make-current.xml index 00c9d505..936c2dbe 100644 --- a/doc/xdg-app-make-current.xml +++ b/doc/flatpak-make-current.xml @@ -2,11 +2,11 @@ - + - xdg-app make-current - xdg-app + flatpak make-current + flatpak @@ -19,18 +19,18 @@ - xdg-app make-current + flatpak make-current 1 - xdg-app-make-current + flatpak-make-current Make a specific version of an app current - xdg-app make-current + flatpak make-current OPTION APP BRANCH @@ -118,7 +118,7 @@ Examples - $ xdg-app --user make-current org.gnome.GEdit 3.14 + $ flatpak --user make-current org.gnome.GEdit 3.14 @@ -127,9 +127,9 @@ See also - xdg-app1, - xdg-app-install-app1, - xdg-app-list-apps1 + flatpak1, + flatpak-install-app1, + flatpak-list-apps1 diff --git a/doc/xdg-app-override.xml b/doc/flatpak-override.xml similarity index 93% rename from doc/xdg-app-override.xml rename to doc/flatpak-override.xml index b87b3dc6..50422c45 100644 --- a/doc/xdg-app-override.xml +++ b/doc/flatpak-override.xml @@ -2,11 +2,11 @@ - + - xdg-app override - xdg-app + flatpak override + flatpak @@ -19,18 +19,18 @@ - xdg-app override + flatpak override 1 - xdg-app-override + flatpak-override Override application requirements - xdg-app override + flatpak override OPTION APP @@ -47,7 +47,7 @@ By default the application gets access to the resources it requested when it is started. But the user can override it 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. @@ -212,10 +212,10 @@ Examples - $ xdg-app override --nosocket=wayland org.gnome.GEdit + $ flatpak override --nosocket=wayland org.gnome.GEdit - $ xdg-app override --filesystem=home org.mozilla.Firefox + $ flatpak override --filesystem=home org.mozilla.Firefox @@ -224,8 +224,8 @@ See also - xdg-app1 - xdg-app-run1 + flatpak1 + flatpak-run1 diff --git a/doc/xdg-app-remote-add.xml b/doc/flatpak-remote-add.xml similarity index 89% rename from doc/xdg-app-remote-add.xml rename to doc/flatpak-remote-add.xml index 4b4af250..f0a1c47d 100644 --- a/doc/xdg-app-remote-add.xml +++ b/doc/flatpak-remote-add.xml @@ -2,11 +2,11 @@ - + - xdg-app remote-add - xdg-app + flatpak remote-add + flatpak @@ -19,18 +19,18 @@ - xdg-app remote-add + flatpak remote-add 1 - xdg-app-remote-add + flatpak-remote-add Add a remote repository - xdg-app remote-add + flatpak remote-add OPTION NAME LOCATION @@ -41,7 +41,7 @@ Description - Adds a remote repository to the xdg-app repository configuration. + Adds a remote repository to the flatpak repository configuration. NAME is the name for the new remote, and LOCATION is the url or pathname for the repository. @@ -177,7 +177,7 @@ Examples - $ xdg-app --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/ + $ flatpak --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/ @@ -185,10 +185,10 @@ See also - xdg-app1, - xdg-app-modify-remote1, - xdg-app-delete-remote1, - xdg-app-list-remotes1 + flatpak1, + flatpak-modify-remote1, + flatpak-delete-remote1, + flatpak-list-remotes1 diff --git a/doc/xdg-app-remote-delete.xml b/doc/flatpak-remote-delete.xml similarity index 81% rename from doc/xdg-app-remote-delete.xml rename to doc/flatpak-remote-delete.xml index d3f4d039..9f1cfbe5 100644 --- a/doc/xdg-app-remote-delete.xml +++ b/doc/flatpak-remote-delete.xml @@ -2,11 +2,11 @@ - + - xdg-app remote-delete - xdg-app + flatpak remote-delete + flatpak @@ -19,18 +19,18 @@ - xdg-app remote-delete + flatpak remote-delete 1 - xdg-app-remote-delete + flatpak-remote-delete Delete a remote repository - xdg-app remote-delete + flatpak remote-delete OPTION NAME @@ -40,7 +40,7 @@ Description - Removes a remote repository from the xdg-app repository configuration. + Removes a remote repository from the flatpak repository configuration. NAME is the name of an existing remote. @@ -104,7 +104,7 @@ Examples - $ xdg-app --user remote-delete dried-raisins + $ flatpak --user remote-delete dried-raisins @@ -112,10 +112,10 @@ See also - xdg-app1, - xdg-app-add-remote1, - xdg-app-modify-remote1, - xdg-app-list-remotes1 + flatpak1, + flatpak-add-remote1, + flatpak-modify-remote1, + flatpak-list-remotes1 diff --git a/doc/xdg-app-remote-list.xml b/doc/flatpak-remote-list.xml similarity index 86% rename from doc/xdg-app-remote-list.xml rename to doc/flatpak-remote-list.xml index 5babd571..552c5cc3 100644 --- a/doc/xdg-app-remote-list.xml +++ b/doc/flatpak-remote-list.xml @@ -2,11 +2,11 @@ - + - xdg-app remote-list - xdg-app + flatpak remote-list + flatpak @@ -19,18 +19,18 @@ - xdg-app remote-list + flatpak remote-list 1 - xdg-app-remote-list + flatpak-remote-list List remote repositories - xdg-app remote-list + flatpak remote-list OPTION @@ -119,7 +119,7 @@ Examples - $ xdg-app remote-list --user --show-details + $ flatpak remote-list --user --show-details 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 See also - xdg-app1, - xdg-app-add-remote1, - xdg-app-delete-remote1 + flatpak1, + flatpak-add-remote1, + flatpak-delete-remote1 diff --git a/doc/xdg-app-remote-ls.xml b/doc/flatpak-remote-ls.xml similarity index 91% rename from doc/xdg-app-remote-ls.xml rename to doc/flatpak-remote-ls.xml index a1b57f01..bbc63802 100644 --- a/doc/xdg-app-remote-ls.xml +++ b/doc/flatpak-remote-ls.xml @@ -2,11 +2,11 @@ - + - xdg-app remote-ls - xdg-app + flatpak remote-ls + flatpak @@ -19,18 +19,18 @@ - xdg-app remote-ls + flatpak remote-ls 1 - xdg-app-remote-ls + flatpak-remote-ls Show available runtimes and applications - xdg-app remote-ls + flatpak remote-ls OPTION REMOTE @@ -42,7 +42,7 @@ Shows runtimes and applications that are available in the remote repository with the name REMOTE. - You can find all configured remote repositories with xdg-app list-repos. + You can find all configured remote repositories with flatpak list-repos. Unless overridden with the --user option, this command uses @@ -138,7 +138,7 @@ Examples - $ xdg-app --user remote-ls --only-apps testrepo + $ flatpak --user remote-ls --only-apps testrepo org.gnome.Builder diff --git a/doc/xdg-app-remote-modify.xml b/doc/flatpak-remote-modify.xml similarity index 90% rename from doc/xdg-app-remote-modify.xml rename to doc/flatpak-remote-modify.xml index 12f9e0b9..2462b1c5 100644 --- a/doc/xdg-app-remote-modify.xml +++ b/doc/flatpak-remote-modify.xml @@ -2,11 +2,11 @@ - + - xdg-app remote-modify - xdg-app + flatpak remote-modify + flatpak @@ -19,18 +19,18 @@ - xdg-app remote-modify + flatpak remote-modify 1 - xdg-app-remote-modify + flatpak-remote-modify Modify a remote repository - xdg-app remote-modify + flatpak remote-modify OPTION NAME @@ -40,7 +40,7 @@ Description - 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. NAME is the name for the remote. @@ -193,7 +193,7 @@ Examples - $ xdg-app --user remote-modify --no-gpg-verify test-repo + $ flatpak --user remote-modify --no-gpg-verify test-repo @@ -201,10 +201,10 @@ See also - xdg-app1, - xdg-app-add-remote1, - xdg-app-delete-remote1, - xdg-app-list-remotes1 + flatpak1, + flatpak-add-remote1, + flatpak-delete-remote1, + flatpak-list-remotes1 diff --git a/doc/xdg-app-run.xml b/doc/flatpak-run.xml similarity index 95% rename from doc/xdg-app-run.xml rename to doc/flatpak-run.xml index 256b6e89..9f99c25a 100644 --- a/doc/xdg-app-run.xml +++ b/doc/flatpak-run.xml @@ -2,11 +2,11 @@ - + - xdg-app run - xdg-app + flatpak run + flatpak @@ -19,18 +19,18 @@ - xdg-app run + flatpak run 1 - xdg-app-run + flatpak-run Run an application - xdg-app run + flatpak run OPTION APP ARG @@ -46,7 +46,7 @@ Extra arguments are passed on to the application. - 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 /usr and a writable directory at /var, whose content is preserved between application runs. The application itself is mounted at /app. @@ -315,10 +315,10 @@ Examples - $ xdg-app run org.gnome.GEdit + $ flatpak run org.gnome.GEdit - $ xdg-app run --devel --command=bash org.gnome.Builder + $ flatpak run --devel --command=bash org.gnome.Builder @@ -327,9 +327,9 @@ See also - xdg-app1 - xdg-app-override1 - xdg-app-enter1 + flatpak1 + flatpak-override1 + flatpak-enter1 diff --git a/doc/xdg-app-uninstall.xml b/doc/flatpak-uninstall.xml similarity index 94% rename from doc/xdg-app-uninstall.xml rename to doc/flatpak-uninstall.xml index 4feb079f..31529650 100644 --- a/doc/xdg-app-uninstall.xml +++ b/doc/flatpak-uninstall.xml @@ -2,11 +2,11 @@ - + dxg-app uninstall - xdg-app + flatpak @@ -19,18 +19,18 @@ - xdg-app uninstall + flatpak uninstall 1 - xdg-app-uninstall + flatpak-uninstall Uninstall an application or runtime - xdg-app uninstall + flatpak uninstall OPTION NAME BRANCH @@ -158,7 +158,7 @@ Examples - $ xdg-app --user uninstall org.gnome.GEdit + $ flatpak --user uninstall org.gnome.GEdit diff --git a/doc/xdg-app-update.xml b/doc/flatpak-update.xml similarity index 92% rename from doc/xdg-app-update.xml rename to doc/flatpak-update.xml index 8c29342f..684e333e 100644 --- a/doc/xdg-app-update.xml +++ b/doc/flatpak-update.xml @@ -2,11 +2,11 @@ - + - xdg-app update - xdg-app + flatpak update + flatpak @@ -19,18 +19,18 @@ - xdg-app update + flatpak update 1 - xdg-app-update + flatpak-update Update a runtime - xdg-app update + flatpak update OPTION NAME BRANCH @@ -184,7 +184,7 @@ Examples - $ xdg-app --user update org.gnome.GEdit + $ flatpak --user update org.gnome.GEdit @@ -193,9 +193,9 @@ See also - xdg-app1, - xdg-app-install-app1, - xdg-app-list-apps1 + flatpak1, + flatpak-install-app1, + flatpak-list-apps1 diff --git a/doc/xdg-app.xml b/doc/flatpak.xml similarity index 82% rename from doc/xdg-app.xml rename to doc/flatpak.xml index f5a1d0c6..e7b144a1 100644 --- a/doc/xdg-app.xml +++ b/doc/flatpak.xml @@ -2,11 +2,11 @@ - + - xdg-app - xdg-app + flatpak + flatpak @@ -19,18 +19,18 @@ - xdg-app + flatpak 1 - xdg-app + flatpak Build, install and run applications and runtimes - xdg-app + flatpak OPTION COMMAND @@ -40,18 +40,18 @@ Description - xdg-app is a tool for managing applications and the runtimes - they use. In the xdg-app model, applications can be built and + flatpak is a tool for managing applications and the runtimes + they use. In the flatpak model, applications can be built and distributed independently from the host system they are used on, and they are isolated from the host system ('sandboxed') to some degree, at runtime. - 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 - $prefix/share/xdg-app/, and the per-user - data is in $HOME/.local/share/xdg-app/. + $prefix/share/flatpak/, and the per-user + data is in $HOME/.local/share/flatpak/. Below these locations, there is a local repository in the repo/ subdirectory and installed runtimes and applications are in the corresponding runtime/ @@ -59,7 +59,7 @@ - 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 ostree utility. Installed runtimes and applications are OSTree checkouts. @@ -107,35 +107,35 @@ - xdg-app-install1 + flatpak-install1 Install an application or a runtime from a remote or bundle. - xdg-app-update1 + flatpak-update1 Update an installed application or runtime. - xdg-app-uninstall1 + flatpak-uninstall1 Uninstall an installed application or runtime. - xdg-app-list1 + flatpak-list1 List installed applications and/or runtimes. - xdg-app-info1 + flatpak-info1 Show information for an installed application or runtime. @@ -148,28 +148,28 @@ - xdg-app-run1 + flatpak-run1 Run an application. - xdg-app-override1 + flatpak-override1 Override permissions for an application. - xdg-app-export-file1 + flatpak-export-file1 Grant an application access to a specific file. - xdg-app-enter1 + flatpak-enter1 Enter the namespace of a running application. @@ -181,35 +181,35 @@ - xdg-app-remote-add1 + flatpak-remote-add1 Add a new remote repository. - xdg-app-remote-modify1 + flatpak-remote-modify1 Modify properties of a configured remote repository. - xdg-app-remote-delete1 + flatpak-remote-delete1 Delete a configured remote repository. - xdg-app-remote-list1 + flatpak-remote-list1 List all configured remote repositories. - xdg-app-remote-ls1 + flatpak-remote-ls1 List contents of a configured remote repository. @@ -221,56 +221,56 @@ - xdg-app-build-init1 + flatpak-build-init1 Initialize a build directory. - xdg-app-build1 + flatpak-build1 Run a build command in a build directory. - xdg-app-build-finish1 + flatpak-build-finish1 Finalizes a build directory for export. - xdg-app-build-export1 + flatpak-build-export1 Export a build directory to a repository. - xdg-app-build-bundle1 + flatpak-build-bundle1 Create a bundle file from a build directory. - xdg-app-build-import-bundle1 + flatpak-build-import-bundle1 Import a file bundle into a local repository. - xdg-app-build-update-repo1 + flatpak-build-update-repo1 Update the summary file in a repository. - xdg-app-build-sign1 + flatpak-build-sign1 Sign an application or runtime after its been exported. diff --git a/doc/reference/.gitignore b/doc/reference/.gitignore index 9f06b7ef..7ee83829 100644 --- a/doc/reference/.gitignore +++ b/doc/reference/.gitignore @@ -2,15 +2,15 @@ html/ xml/ *.stamp *.bak -xdg-app-decl-list.txt -xdg-app-decl.txt -xdg-app-overrides.txt -xdg-app-undeclared.txt -xdg-app-undocumented.txt -xdg-app-unused.txt -xdg-app.args -xdg-app.hierarchy -xdg-app.interfaces -xdg-app.prerequisites -xdg-app.signals -xdg-app.types +flatpak-decl-list.txt +flatpak-decl.txt +flatpak-overrides.txt +flatpak-undeclared.txt +flatpak-undocumented.txt +flatpak-unused.txt +flatpak.args +flatpak.hierarchy +flatpak.interfaces +flatpak.prerequisites +flatpak.signals +flatpak.types diff --git a/doc/reference/version.xml.in b/doc/reference/version.xml.in index e1b2fdf3..a1116ea1 100644 --- a/doc/reference/version.xml.in +++ b/doc/reference/version.xml.in @@ -1 +1 @@ -@XDG_APP_MAJOR_VERSION@.@XDG_APP_MINOR_VERSION@.@XDG_APP_MICRO_VERSION@ +@FLATPAK_MAJOR_VERSION@.@FLATPAK_MINOR_VERSION@.@FLATPAK_MICRO_VERSION@ diff --git a/document-portal/xdg-document-portal.service.in b/document-portal/xdg-document-portal.service.in index ac7769bf..66f9cbd7 100644 --- a/document-portal/xdg-document-portal.service.in +++ b/document-portal/xdg-document-portal.service.in @@ -1,5 +1,5 @@ [Unit] -Description=xdg-app document portal service +Description=flatpak document portal service [Service] BusName=org.freedesktop.portal.Documents diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c index 52b0b938..28e35097 100644 --- a/document-portal/xdp-main.c +++ b/document-portal/xdp-main.c @@ -36,7 +36,7 @@ typedef struct static GMainLoop *loop = NULL; static FlatpakDb *db = NULL; -static XdgAppPermissionStore *permission_store; +static FlatpakPermissionStore *permission_store; static int daemon_event_fd = -1; static int final_exit_status = 0; static dev_t fuse_dev = 0; @@ -89,7 +89,7 @@ do_set_permissions (FlatpakDbEntry *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, FALSE, doc_id, @@ -243,7 +243,7 @@ portal_delete (GDBusMethodInvocation *invocation, flatpak_db_set_entry (db, id, NULL); 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); } @@ -303,7 +303,7 @@ do_create_doc (struct stat *parent_st_buf, const char *path, gboolean reuse_exis if (persistent) { - xdg_app_permission_store_call_set (permission_store, + flatpak_permission_store_call_set (permission_store, TABLE_NAME, TRUE, id, @@ -821,7 +821,7 @@ main (int argc, 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/PermissionStore", NULL, &error); diff --git a/env.d/xdg-app.env.in b/env.d/flatpak.env.in similarity index 100% rename from env.d/xdg-app.env.in rename to env.d/flatpak.env.in diff --git a/lib/flatpak-error.c b/lib/flatpak-error.c index 806fbe9e..c2b550bc 100644 --- a/lib/flatpak-error.c +++ b/lib/flatpak-error.c @@ -1,4 +1,4 @@ -/* xdg-app-error.c +/* flatpak-error.c * * Copyright (C) 2015 Red Hat, Inc * @@ -26,9 +26,9 @@ #include /** - * SECTION:xdg-app-error + * SECTION:flatpak-error * @Title: Error codes * */ -G_DEFINE_QUARK (xdg - app - error - quark, flatpak_error) +G_DEFINE_QUARK (flatpak-error-quark, flatpak_error) diff --git a/lib/flatpak-error.h b/lib/flatpak-error.h index 9c7b5938..58380e17 100644 --- a/lib/flatpak-error.h +++ b/lib/flatpak-error.h @@ -1,4 +1,4 @@ -/* xdg-app-error.c +/* flatpak-error.c * * Copyright (C) 2015 Red Hat, Inc * diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c index 5e9d9494..40ba33c0 100644 --- a/lib/flatpak-installation.c +++ b/lib/flatpak-installation.c @@ -34,15 +34,15 @@ #include "flatpak-error.h" /** - * SECTION:xdg-app-installation + * SECTION:flatpak-installation * @Title: FlatpakInstallation * @Short_description: Installation information * * 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 - * 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). * * 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: * @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_data: user data passed to @progress * @cancellable: (nullable): a #GCancellable * @error: return location for a #GError * - * Install an application or runtime from an xdg-app bundle file. - * See xdg-app-build-bundle(1) for how to create brundles. + * Install an application or runtime from an flatpak bundle file. + * See flatpak-build-bundle(1) for how to create brundles. * * 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 * - * 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 */ GBytes * @@ -1308,7 +1308,7 @@ flatpak_installation_fetch_remote_metadata_sync (FlatpakInstallation *self, * * 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 */ GBytes * diff --git a/lib/flatpak-installed-ref.c b/lib/flatpak-installed-ref.c index 49150646..9e263943 100644 --- a/lib/flatpak-installed-ref.c +++ b/lib/flatpak-installed-ref.c @@ -27,7 +27,7 @@ #include "flatpak-enum-types.h" /** - * SECTION:xdg-app-installed-ref + * SECTION:flatpak-installed-ref * @Title: FlatpakInstalledRef * @Short_description: Installed application reference * diff --git a/lib/flatpak-ref.c b/lib/flatpak-ref.c index 686940b3..ba28b070 100644 --- a/lib/flatpak-ref.c +++ b/lib/flatpak-ref.c @@ -25,11 +25,11 @@ #include "flatpak-enum-types.h" /** - * SECTION:xdg-app-ref + * SECTION:flatpak-ref * @Title: FlatpakRef * @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 contain only libraries and data. An FlatpakRef object (or short: ref) * can refer to either of these. diff --git a/lib/flatpak-remote-ref.c b/lib/flatpak-remote-ref.c index bfaad1b2..a62565a6 100644 --- a/lib/flatpak-remote-ref.c +++ b/lib/flatpak-remote-ref.c @@ -28,7 +28,7 @@ #include "flatpak-enum-types.h" /** - * SECTION:xdg-app-remote-ref + * SECTION:flatpak-remote-ref * @Title: FlatpakRemoteRef * @Short_description: Remote application reference * diff --git a/lib/flatpak-remote.c b/lib/flatpak-remote.c index 1e1528a5..6a860c55 100644 --- a/lib/flatpak-remote.c +++ b/lib/flatpak-remote.c @@ -28,7 +28,7 @@ #include /** - * SECTION:xdg-app-remote + * SECTION:flatpak-remote * @Short_description: Remote repository * @Title: FlatpakRemote * diff --git a/lib/flatpak-version-macros.h.in b/lib/flatpak-version-macros.h.in index c010a5cd..21e858ad 100644 --- a/lib/flatpak-version-macros.h.in +++ b/lib/flatpak-version-macros.h.in @@ -34,7 +34,7 @@ #endif /** - * SECTION:xdg-app-version-macros + * SECTION:flatpak-version-macros * @Title: Version information */ diff --git a/lib/test-lib.c b/lib/test-lib.c index 869807e4..bd6f4487 100644 --- a/lib/test-lib.c +++ b/lib/test-lib.c @@ -92,7 +92,7 @@ main (int argc, char *argv[]) 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); if (bundle == NULL) { diff --git a/po/POTFILES.in b/po/POTFILES.in index 6913e1f8..1dc8d837 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1 @@ -system-helper/org.freedesktop.XdgApp.policy.in +system-helper/org.freedesktop.Flatpak.policy.in diff --git a/profile/xdg-app.sh.in b/profile/flatpak.sh.in similarity index 74% rename from profile/xdg-app.sh.in rename to profile/flatpak.sh.in index 4c86566d..0fba9ee2 100644 --- a/profile/xdg-app.sh.in +++ b/profile/flatpak.sh.in @@ -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/}" export XDG_DATA_DIRS diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc index 5c931617..89dca771 100644 --- a/session-helper/Makefile.am.inc +++ b/session-helper/Makefile.am.inc @@ -1,18 +1,18 @@ libexec_PROGRAMS += \ - xdg-app-session-helper \ + flatpak-session-helper \ $(NULL) -service_in_files += session-helper/xdg-app-session-helper.service.in -systemduserunit_DATA += session-helper/xdg-app-session-helper.service +service_in_files += session-helper/flatpak-session-helper.service.in +systemduserunit_DATA += session-helper/flatpak-session-helper.service -service_in_files += session-helper/org.freedesktop.XdgApp.service.in -dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service +service_in_files += session-helper/org.freedesktop.Flatpak.service.in +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-permission-store.c \ session-helper/flatpak-permission-store.h \ $(NULL) -xdg_app_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la -xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS) +flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la +flatpak_session_helper_CFLAGS = $(BASE_CFLAGS) diff --git a/session-helper/flatpak-permission-store.c b/session-helper/flatpak-permission-store.c index 7cab93fb..89da8e2a 100644 --- a/session-helper/flatpak-permission-store.c +++ b/session-helper/flatpak-permission-store.c @@ -144,9 +144,9 @@ ensure_writeout (Table *table, } static gboolean -handle_list (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name) +handle_list (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name) { Table *table; @@ -158,7 +158,7 @@ handle_list (XdgAppPermissionStore *object, 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; } @@ -186,10 +186,10 @@ get_app_permissions (FlatpakDbEntry *entry) } static gboolean -handle_lookup (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name, - const gchar *id) +handle_lookup (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name, + const gchar *id) { Table *table; @@ -213,7 +213,7 @@ handle_lookup (XdgAppPermissionStore *object, data = flatpak_db_entry_get_data (entry); permissions = get_app_permissions (entry); - xdg_app_permission_store_complete_lookup (object, invocation, + flatpak_permission_store_complete_lookup (object, invocation, permissions, g_variant_new_variant (data)); @@ -221,10 +221,10 @@ handle_lookup (XdgAppPermissionStore *object, } static void -emit_deleted (XdgAppPermissionStore *object, - const gchar *table_name, - const gchar *id, - FlatpakDbEntry *entry) +emit_deleted (FlatpakPermissionStore *object, + const gchar *table_name, + const gchar *id, + FlatpakDbEntry *entry) { g_autoptr(GVariant) data = NULL; g_autoptr(GVariant) permissions = NULL; @@ -232,7 +232,7 @@ emit_deleted (XdgAppPermissionStore *object, data = flatpak_db_entry_get_data (entry); 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, TRUE, g_variant_new_variant (data), @@ -241,10 +241,10 @@ emit_deleted (XdgAppPermissionStore *object, static void -emit_changed (XdgAppPermissionStore *object, - const gchar *table_name, - const gchar *id, - FlatpakDbEntry *entry) +emit_changed (FlatpakPermissionStore *object, + const gchar *table_name, + const gchar *id, + FlatpakDbEntry *entry) { g_autoptr(GVariant) data = NULL; g_autoptr(GVariant) permissions = NULL; @@ -252,7 +252,7 @@ emit_changed (XdgAppPermissionStore *object, data = flatpak_db_entry_get_data (entry); permissions = get_app_permissions (entry); - xdg_app_permission_store_emit_changed (object, + flatpak_permission_store_emit_changed (object, table_name, id, FALSE, g_variant_new_variant (data), @@ -260,10 +260,10 @@ emit_changed (XdgAppPermissionStore *object, } static gboolean -handle_delete (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name, - const gchar *id) +handle_delete (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name, + const gchar *id) { Table *table; @@ -291,13 +291,13 @@ handle_delete (XdgAppPermissionStore *object, } static gboolean -handle_set (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name, - gboolean create, - const gchar *id, - GVariant *app_permissions, - GVariant *data) +handle_set (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name, + gboolean create, + const gchar *id, + GVariant *app_permissions, + GVariant *data) { Table *table; GVariantIter iter; @@ -349,13 +349,13 @@ handle_set (XdgAppPermissionStore *object, } static gboolean -handle_set_permission (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name, - gboolean create, - const gchar *id, - const gchar *app, - const gchar *const *permissions) +handle_set_permission (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name, + gboolean create, + const gchar *id, + const gchar *app, + const gchar *const *permissions) { Table *table; @@ -392,12 +392,12 @@ handle_set_permission (XdgAppPermissionStore *object, } static gboolean -handle_set_value (XdgAppPermissionStore *object, - GDBusMethodInvocation *invocation, - const gchar *table_name, - gboolean create, - const gchar *id, - GVariant *data) +handle_set_value (FlatpakPermissionStore *object, + GDBusMethodInvocation *invocation, + const gchar *table_name, + gboolean create, + const gchar *id, + GVariant *data) { Table *table; @@ -439,13 +439,13 @@ handle_set_value (XdgAppPermissionStore *object, void flatpak_permission_store_start (GDBusConnection *connection) { - XdgAppPermissionStore *store; + FlatpakPermissionStore *store; GError *error = NULL; tables = g_hash_table_new_full (g_str_hash, g_str_equal, 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-lookup", G_CALLBACK (handle_lookup), NULL); diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index d9ba8b30..54ec63e4 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -30,11 +30,11 @@ static char *monitor_dir; static gboolean -handle_request_monitor (XdgAppSessionHelper *object, +handle_request_monitor (FlatpakSessionHelper *object, GDBusMethodInvocation *invocation, gpointer user_data) { - xdg_app_session_helper_complete_request_monitor (object, invocation, + flatpak_session_helper_complete_request_monitor (object, invocation, monitor_dir); return TRUE; @@ -45,12 +45,12 @@ on_bus_acquired (GDBusConnection *connection, const gchar *name, gpointer user_data) { - XdgAppSessionHelper *helper; + FlatpakSessionHelper *helper; GError *error = NULL; 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); @@ -134,7 +134,7 @@ main (int argc, 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) { g_print ("Can't create %s\n", monitor_dir); diff --git a/session-helper/flatpak-session-helper.service.in b/session-helper/flatpak-session-helper.service.in new file mode 100644 index 00000000..e14cc27d --- /dev/null +++ b/session-helper/flatpak-session-helper.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=flatpak session helper + +[Service] +BusName=org.freedesktop.Flatpak +ExecStart=@libexecdir@/flatpak-session-helper +Type=dbus diff --git a/session-helper/org.freedesktop.Flatpak.service.in b/session-helper/org.freedesktop.Flatpak.service.in new file mode 100644 index 00000000..e02215e0 --- /dev/null +++ b/session-helper/org.freedesktop.Flatpak.service.in @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.freedesktop.Flatpak +Exec=@libexecdir@/flatpak-session-helper +SystemdService=flatpak-session-helper.service diff --git a/session-helper/org.freedesktop.XdgApp.service.in b/session-helper/org.freedesktop.XdgApp.service.in deleted file mode 100644 index 3ad6f64d..00000000 --- a/session-helper/org.freedesktop.XdgApp.service.in +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.XdgApp -Exec=@libexecdir@/xdg-app-session-helper -SystemdService=xdg-app-session-helper.service diff --git a/session-helper/xdg-app-session-helper.service.in b/session-helper/xdg-app-session-helper.service.in deleted file mode 100644 index 7279a3af..00000000 --- a/session-helper/xdg-app-session-helper.service.in +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=xdg-app session helper - -[Service] -BusName=org.freedesktop.XdgApp -ExecStart=@libexecdir@/xdg-app-session-helper -Type=dbus diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc index 7b346968..32cb7e7b 100644 --- a/system-helper/Makefile.am.inc +++ b/system-helper/Makefile.am.inc @@ -1,34 +1,34 @@ libexec_PROGRAMS += \ - xdg-app-system-helper \ + flatpak-system-helper \ $(NULL) dbussystemservicedir = $(datadir)/dbus-1/system-services -service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in -dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service +service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.in +dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service 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 -systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service +service_in_files += system-helper/flatpak-system-helper.service.in +systemdsystemunit_DATA = system-helper/flatpak-system-helper.service -xdg_app_system_helper_SOURCES = \ +flatpak_system_helper_SOURCES = \ system-helper/flatpak-system-helper.c \ lib/flatpak-error.c \ $(NULL) -xdg_app_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_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la +flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS) polkit_rulesdir = $(datadir)/polkit-1/rules.d dist_polkit_rules_DATA = \ - system-helper/org.freedesktop.XdgApp.rules + system-helper/org.freedesktop.Flatpak.rules polkit_policydir = $(datadir)/polkit-1/actions dist_polkit_policy_DATA = \ - system-helper/org.freedesktop.XdgApp.policy + system-helper/org.freedesktop.Flatpak.policy @INTLTOOL_POLICY_RULE@ -EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.XdgApp.SystemHelper.conf -DISTCLEANFILES += system-helper/org.freedesktop.XdgApp.policy +EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf +DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index 44ce7983..fd03ccbf 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -43,7 +43,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitDetails, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref) static gboolean -handle_deploy (XdgAppSystemHelper *object, +handle_deploy (FlatpakSystemHelper *object, GDBusMethodInvocation *invocation, const gchar *arg_repo_path, 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; } @@ -249,10 +249,10 @@ on_bus_acquired (GDBusConnection *connection, const gchar *name, gpointer user_data) { - XdgAppSystemHelper *helper; + FlatpakSystemHelper *helper; 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_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); diff --git a/system-helper/flatpak-system-helper.service.in b/system-helper/flatpak-system-helper.service.in new file mode 100644 index 00000000..7c7cf676 --- /dev/null +++ b/system-helper/flatpak-system-helper.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=flatpak system helper + +[Service] +BusName=org.freedesktop.Flatpak.SystemHelper +ExecStart=@libexecdir@/flatpak-system-helper +Type=dbus diff --git a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf similarity index 61% rename from system-helper/org.freedesktop.XdgApp.SystemHelper.conf rename to system-helper/org.freedesktop.Flatpak.SystemHelper.conf index 6b6a6467..4aac5b8c 100644 --- a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf +++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf @@ -6,19 +6,19 @@ + for the the flatpak system helper to work. --> - + - - + - diff --git a/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in new file mode 100644 index 00000000..4e9293a6 --- /dev/null +++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.freedesktop.Flatpak.SystemHelper +Exec=@libexecdir@/flatpak-system-helper +SystemdService=flatpak-system-helper.service diff --git a/system-helper/org.freedesktop.XdgApp.policy.in b/system-helper/org.freedesktop.Flatpak.policy.in similarity index 90% rename from system-helper/org.freedesktop.XdgApp.policy.in rename to system-helper/org.freedesktop.Flatpak.policy.in index f5f22729..a4203396 100644 --- a/system-helper/org.freedesktop.XdgApp.policy.in +++ b/system-helper/org.freedesktop.Flatpak.policy.in @@ -5,15 +5,15 @@ - The XdgApp Project + The Flatpak Project https://cgit.freedesktop.org/xdg-app/xdg-app/ package-x-generic - +