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

Explode exports on deploy

tingping/wmclass
Alexander Larsson 2015-01-09 11:46:07 +01:00
parent e2c8d59316
commit 0c28aab49a
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xdg-app-dir.c
View File

@ -6,6 +6,7 @@
#include "libgsystem.h"
#include "xdg-app-dir.h"
#include "xdg-app-utils.h"
struct XdgAppDir {
GObject parent;
@ -151,6 +152,12 @@ xdg_app_dir_get_deploy_dir (XdgAppDir *self,
return g_file_resolve_relative_path (self->basedir, ref);
}
GFile *
xdg_app_dir_get_exports_dir (XdgAppDir *self)
{
return g_file_resolve_relative_path (self->basedir, "exports");
}
GFile *
xdg_app_dir_get_app_data (XdgAppDir *self,
const char *app)
@ -392,6 +399,8 @@ xdg_app_dir_deploy (XdgAppDir *self,
gs_unref_object GFile *deploy_base = NULL;
gs_unref_object GFile *checkoutdir = NULL;
gs_unref_object GFile *dotref = NULL;
gs_unref_object GFile *export = NULL;
gs_unref_object GFile *exports = NULL;
if (!xdg_app_dir_ensure_repo (self, cancellable, error))
goto out;
@ -437,6 +446,25 @@ xdg_app_dir_deploy (XdgAppDir *self,
G_FILE_CREATE_NONE, NULL, cancellable, error))
goto out;
if (g_str_has_prefix (ref, "app"))
{
export = g_file_get_child (checkoutdir, "export");
if (g_file_query_exists (export, cancellable))
{
gs_free char *relative_path = NULL;
gs_free char *symlink_prefix = NULL;
exports = xdg_app_dir_get_exports_dir (self);
relative_path = g_file_get_relative_path (self->basedir, export);
symlink_prefix = g_build_filename ("..", relative_path, NULL);
if (!xdg_app_overlay_symlink_tree (export, exports,
symlink_prefix,
cancellable,
error))
goto out;
}
}
if (!xdg_app_dir_set_active (self, ref, checksum, cancellable, error))
goto out;

1
xdg-app-dir.h
View File

@ -32,6 +32,7 @@ gboolean xdg_app_dir_is_user (XdgAppDir *self);
GFile * xdg_app_dir_get_path (XdgAppDir *self);
GFile * xdg_app_dir_get_deploy_dir (XdgAppDir *self,
const char *ref);
GFile * xdg_app_dir_get_exports_dir (XdgAppDir *self);
GFile * xdg_app_dir_get_if_deployed (XdgAppDir *self,
const char *ref,
const char *checksum,