Merge lp:~ted/ubuntu-app-launch/libertine-detection into lp:ubuntu-app-launch/15.10

[Ted Gould]

Detect applications that are in a libertine container

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ted/ubuntu-app-launch/libertine-detection/+merge/264789/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/12/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Mostly LGTM, no blockers, a few suggestions/questions inline

review: Approve

[Ted Gould (ted)]

Took your comments into account. The shared function was actually in a different branch I was working on, so I pulled it into this one. Also added the detection of libertine apps that are in the container's ~/.local/share/applications, which is important for clients like Steam or WINE.

[lp:~ted/ubuntu-app-launch/libertine-detection]

217. By Ted Gould on 2015-08-11

Update to latest xmir-support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:217
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/14/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[lp:~ted/ubuntu-app-launch/libertine-detection]

218. By Ted Gould on 2015-08-11

Make triplet to appid work for libertine apps

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/15/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/libertine-detection]

219. By Ted Gould on 2015-08-11

Reshuffle code so that JSON and click stuff is all in one file

220. By Ted Gould on 2015-08-11

Grab the libertine cache dirs

221. By Ted Gould on 2015-08-11

Setting data home as well

222. By Ted Gould on 2015-08-11

Testing the libertine triplet cases

223. By Ted Gould on 2015-08-11

Thought of another one

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/16/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, looks good.

review: Approve

=== modified file 'helpers-shared.c'
--- helpers-shared.c	2014-11-21 21:17:18 +0000
+++ helpers-shared.c	2015-08-11 22:16:35 +0000
@@ -25,7 +25,7 @@
 #include "libubuntu-app-launch/recoverable-problem.h"
 
 /* Check to make sure we have the sections and keys we want */
-static gboolean
+gboolean
 verify_keyfile (GKeyFile * inkeyfile, const gchar * desktop)
 {
 	if (inkeyfile == NULL) return FALSE;

=== modified file 'helpers.h'
--- helpers.h	2014-11-20 20:33:59 +0000
+++ helpers.h	2015-08-11 22:16:35 +0000
@@ -54,3 +54,5 @@
                                   const gchar *   jobname,
                                   const gchar *   instancename);
 
+gboolean   verify_keyfile        (GKeyFile *    inkeyfile,
+                                  const gchar * desktop);

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2015-04-30 15:21:05 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2015-08-11 22:16:35 +0000
@@ -18,6 +18,7 @@
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 add_definitions ( -DOOM_HELPER="${pkglibexecdir}/oom-adjust-setuid-helper" -DDEMANGLER_PATH="${pkglibexecdir}/socket-demangler" )
+add_definitions ( -DLIBERTINE_LAUNCH="${CMAKE_INSTALL_FULL_BINDIR}/libertine-launch" )
 
 set(LAUNCHER_HEADERS
 ubuntu-app-launch.h
@@ -29,6 +30,7 @@
 click-exec.c
 desktop-exec.c
 ubuntu-app-launch-trace.c
+app-info.c
 )
 
 set(LAUNCHER_GEN_SOURCES

=== added file 'libubuntu-app-launch/app-info.c'
--- libubuntu-app-launch/app-info.c	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/app-info.c	2015-08-11 22:16:35 +0000
@@ -0,0 +1,245 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <json-glib/json-glib.h>
+#include <click.h>
+
+#include "ubuntu-app-launch.h"
+#include "app-info.h"
+
+/* Try and get a manifest and do a couple sanity checks on it */
+static JsonObject *
+get_manifest (const gchar * pkg)
+{
+	/* Get the directory from click */
+	GError * error = NULL;
+
+	ClickDB * db = click_db_new();
+	/* If TEST_CLICK_DB is unset, this reads the system database. */
+	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
+	if (error != NULL) {
+		g_warning("Unable to read Click database: %s", error->message);
+		g_error_free(error);
+		g_object_unref(db);
+		return NULL;
+	}
+	/* If TEST_CLICK_USER is unset, this uses the current user name. */
+	ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
+	if (error != NULL) {
+		g_warning("Unable to read Click database: %s", error->message);
+		g_error_free(error);
+		g_object_unref(db);
+		return NULL;
+	}
+	g_object_unref(db);
+	JsonObject * manifest = click_user_get_manifest(user, pkg, &error);
+	if (error != NULL) {
+		g_warning("Unable to get manifest for '%s' package: %s", pkg, error->message);
+		g_error_free(error);
+		g_object_unref(user);
+		return NULL;
+	}
+	g_object_unref(user);
+
+	if (!json_object_has_member(manifest, "version")) {
+		g_warning("Manifest file for package '%s' does not have a version", pkg);
+		json_object_unref(manifest);
+		return NULL;
+	}
+
+	return manifest;
+}
+
+/* Types of search we can do for an app name */
+typedef enum _app_name_t app_name_t;
+enum _app_name_t {
+	APP_NAME_ONLY,
+	APP_NAME_FIRST,
+	APP_NAME_LAST
+};
+
+/* Figure out the app name if it's one of the keywords */
+static const gchar *
+manifest_app_name (JsonObject ** manifest, const gchar * pkg, const gchar * original_app)
+{
+	app_name_t app_type = APP_NAME_FIRST;
+
+	if (original_app == NULL) {
+		/* first */
+	} else if (g_strcmp0(original_app, "first-listed-app") == 0) {
+		/* first */
+	} else if (g_strcmp0(original_app, "last-listed-app") == 0) {
+		app_type = APP_NAME_LAST;
+	} else if (g_strcmp0(original_app, "only-listed-app") == 0) {
+		app_type = APP_NAME_ONLY;
+	} else {
+		return original_app;
+	}
+
+	if (*manifest == NULL) {
+		*manifest = get_manifest(pkg);
+	}
+
+	JsonObject * hooks = json_object_get_object_member(*manifest, "hooks");
+
+	if (hooks == NULL) {
+		return NULL;
+	}
+
+	GList * apps = json_object_get_members(hooks);
+	if (apps == NULL) {
+		return NULL;
+	}
+
+	const gchar * retapp = NULL;
+
+	switch (app_type) {
+	case APP_NAME_ONLY:
+		if (g_list_length(apps) == 1) {
+			retapp = (const gchar *)apps->data;
+		}
+		break;
+	case APP_NAME_FIRST:
+		retapp = (const gchar *)apps->data;
+		break;
+	case APP_NAME_LAST:
+		retapp = (const gchar *)(g_list_last(apps)->data);
+		break;
+	default:
+		break;
+	}
+
+	g_list_free(apps);
+
+	return retapp;
+}
+
+/* Figure out the app version using the manifest */
+static const gchar *
+manifest_version (JsonObject ** manifest, const gchar * pkg, const gchar * original_ver)
+{
+	if (original_ver != NULL && g_strcmp0(original_ver, "current-user-version") != 0) {
+		return original_ver;
+	} else  {
+		if (*manifest == NULL) {
+			*manifest = get_manifest(pkg);
+		}
+		g_return_val_if_fail(*manifest != NULL, NULL);
+
+		return g_strdup(json_object_get_string_member(*manifest, "version"));
+	}
+
+	return NULL;
+}
+
+/* A click triplet can require using the Click DB and getting a
+   manifest. This code does that to look up the versions */
+gchar *
+click_triplet_to_app_id (const gchar * pkg, const gchar * app, const gchar * ver)
+{
+	const gchar * version = NULL;
+	const gchar * application = NULL;
+	JsonObject * manifest = NULL;
+
+	version = manifest_version(&manifest, pkg, ver);
+	g_return_val_if_fail(version != NULL, NULL);
+
+	application = manifest_app_name(&manifest, pkg, app);
+	g_return_val_if_fail(application != NULL, NULL);
+
+	gchar * retval = g_strdup_printf("%s_%s_%s", pkg, application, version);
+
+	/* The object may hold allocation for some of our strings used above */
+	if (manifest)
+		json_object_unref(manifest);
+
+	return retval;
+}
+
+/* Build an appid how we think it should exist and then make sure
+   we can find it. Then pull it together. */
+gchar *
+libertine_triplet_to_app_id (const gchar * pkg, const gchar * app, const gchar * ver)
+{
+	if (app == NULL) {
+		return NULL;
+	}
+
+	gchar * synthappid = g_strdup_printf("%s_%s_0.0", pkg, app);
+	if (app_info_libertine(synthappid, NULL, NULL)) {
+		return synthappid;
+	} else {
+		g_free(synthappid);
+		return NULL;
+	}
+}
+
+/* Handle the libertine case where we look in the container */
+gboolean
+app_info_libertine (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
+{
+	char * container = NULL;
+	char * app = NULL;
+
+	if (!ubuntu_app_launch_app_id_parse(appid, &container, &app, NULL)) {
+		return FALSE;
+	}
+
+	gchar * desktopname = g_strdup_printf("%s.desktop", app);
+
+	gchar * desktopdir = g_build_filename(g_get_user_cache_dir(), "libertine-container", container, "rootfs", "usr", "share", NULL);
+	gchar * desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
+
+	if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
+		g_free(desktopdir);
+		g_free(desktopfile);
+
+		desktopdir = g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container, ".local", "share", NULL);
+		desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
+
+		if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
+			g_free(desktopdir);
+			g_free(desktopfile);
+
+			g_free(desktopname);
+			g_free(container);
+			g_free(app);
+
+			return FALSE;
+		}
+	}
+
+	g_free(desktopname);
+	g_free(container);
+	g_free(app);
+
+	if (appdir != NULL) {
+		*appdir = desktopdir;
+	} else {
+		g_free(desktopdir);
+	}
+
+	if (appdesktop != NULL) {
+		*appdesktop = desktopfile;
+	} else {
+		g_free(desktopfile);
+	}
+
+	return TRUE;
+}

=== added file 'libubuntu-app-launch/app-info.h'
--- libubuntu-app-launch/app-info.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/app-info.h	2015-08-11 22:16:35 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#pragma once
+
+#include <glib.h>
+
+gboolean app_info_libertine (const gchar * appid, gchar ** appdir, gchar ** appdesktop);
+
+gchar * click_triplet_to_app_id (const gchar * pkg, const gchar * app, const gchar * ver);
+gchar * libertine_triplet_to_app_id (const gchar * pkg, const gchar * app, const gchar * ver);

=== modified file 'libubuntu-app-launch/desktop-exec.c'
--- libubuntu-app-launch/desktop-exec.c	2015-08-11 22:16:34 +0000
+++ libubuntu-app-launch/desktop-exec.c	2015-08-11 22:16:35 +0000
@@ -27,6 +27,8 @@
 #include "ubuntu-app-launch-trace.h"
 #include "recoverable-problem.h"
 #include "ual-tracepoint.h"
+#include "ubuntu-app-launch.h"
+#include "app-info.h"
 
 /* Reports an error on the caller of UAL so that we can track
    who is trying to launch bad AppIDs, and then fix their bug
@@ -70,8 +72,46 @@
 	}
 }
 
+/* Get the keyfile object for a libertine container based application. Look into
+   the container's filesystem on disk and find it in /usr/share/applications in there.
+   Those are currently the only apps that we look at today. We're not ensuring anything
+   about the file other than it has basic sanity. */
+GKeyFile *
+keyfile_for_libertine (const gchar * appid, gchar ** outcontainer)
+{
+	gchar * desktopfile = NULL;
+
+	if (!app_info_libertine(appid, NULL, &desktopfile)) {
+		return NULL;
+	}
+
+	/* We now think we have a valid 'desktopfile' path */
+	GKeyFile * keyfile = g_key_file_new();
+	gboolean loaded = g_key_file_load_from_file(keyfile, desktopfile, G_KEY_FILE_NONE, NULL);
+
+	if (!loaded) {
+		g_free(desktopfile);
+		g_key_file_free(keyfile);
+		return NULL;
+	}
+
+	if (!verify_keyfile(keyfile, desktopfile)) {
+		g_free(desktopfile);
+		g_key_file_free(keyfile);
+		return NULL;
+	}
+
+	g_free(desktopfile);
+
+	if (outcontainer != NULL) {
+		ubuntu_app_launch_app_id_parse(appid, outcontainer, NULL, NULL);
+	}
+
+	return keyfile;
+}
+
 gboolean
-desktop_task_setup (GDBusConnection * bus, const gchar * app_id, EnvHandle * handle)
+desktop_task_setup (GDBusConnection * bus, const gchar * app_id, EnvHandle * handle, gboolean is_libertine)
 {
 	if (app_id == NULL) {
 		g_error("No APP_ID environment variable defined");
@@ -88,10 +128,18 @@
 	ual_tracepoint(desktop_starting_sent, app_id);
 
 	gchar * desktopfilename = NULL;
-	GKeyFile * keyfile = keyfile_for_appid(app_id, &desktopfilename);
+	GKeyFile * keyfile = NULL;
+	gchar * libertinecontainer = NULL;
+	if (is_libertine) {
+		/* desktopfilename not set, not useful in this context */
+		keyfile = keyfile_for_libertine(app_id, &libertinecontainer);
+	} else {
+		keyfile = keyfile_for_appid(app_id, &desktopfilename);
+	}
 
 	if (keyfile == NULL) {
 		report_error_on_caller(app_id);
+		g_free(libertinecontainer);
 		return FALSE;
 	}
 
@@ -124,12 +172,31 @@
 		} else {
 			env_handle_add(handle, "APP_XMIR_ENABLE", "0");
 		}
+	} else if (is_libertine) {
+		/* Default to X for libertine stuff */
+		env_handle_add(handle, "APP_XMIR_ENABLE", "1");
 	}
 
 	/* This string is quoted using desktop file quoting:
 	   http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables */
 	gchar * execline = desktop_to_exec(keyfile, app_id);
 	g_return_val_if_fail(execline != NULL, 1);
+
+	if (is_libertine) {
+		static const gchar * libertine_launch = NULL;
+		if (G_UNLIKELY(libertine_launch == NULL)) {
+			libertine_launch = g_getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH");
+			if (libertine_launch == NULL) {
+				libertine_launch = LIBERTINE_LAUNCH;
+			}
+		}
+
+		gchar * libexec = g_strdup_printf("%s \"%s\" %s", libertine_launch, libertinecontainer, execline);
+		g_free(execline);
+		execline = libexec;
+	}
+	g_free(libertinecontainer); /* Handles NULL, let's be sure it goes away */
+
 	env_handle_add(handle, "APP_EXEC", execline);
 	g_free(execline);
 

=== modified file 'libubuntu-app-launch/desktop-exec.h'
--- libubuntu-app-launch/desktop-exec.h	2014-08-22 20:59:55 +0000
+++ libubuntu-app-launch/desktop-exec.h	2015-08-11 22:16:35 +0000
@@ -17,8 +17,10 @@
  *     Ted Gould <[e-mail]>
  */
 
+#pragma once
+
 #include <glib.h>
 #include "helpers.h"
 
-gboolean desktop_task_setup (GDBusConnection * bus, const gchar * appid, EnvHandle * envhandle);
+gboolean desktop_task_setup (GDBusConnection * bus, const gchar * appid, EnvHandle * envhandle, gboolean is_libertine);
 

=== modified file 'libubuntu-app-launch/ubuntu-app-launch-trace.tp'
--- libubuntu-app-launch/ubuntu-app-launch-trace.tp	2014-08-21 21:00:53 +0000
+++ libubuntu-app-launch/ubuntu-app-launch-trace.tp	2015-08-11 22:16:35 +0000
@@ -18,6 +18,13 @@
 		ctf_string(type, type)
 	)
 )
+TRACEPOINT_EVENT(ubuntu_app_launch, libual_determine_libertine,
+	TP_ARGS(const char *, appid, const char *, executionenv),
+	TP_FIELDS(
+		ctf_string(appid, appid)
+		ctf_string(executionenv, executionenv)
+	)
+)
 TRACEPOINT_EVENT(ubuntu_app_launch, libual_job_path_determined,
 	TP_ARGS(const char *, appid, const char *, job_path),
 	TP_FIELDS(

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
--- libubuntu-app-launch/ubuntu-app-launch.c	2015-06-04 20:22:27 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.c	2015-08-11 22:16:35 +0000
@@ -18,8 +18,6 @@
  */
 
 #include "ubuntu-app-launch.h"
-#include <json-glib/json-glib.h>
-#include <click.h>
 #include <upstart.h>
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
@@ -36,6 +34,7 @@
 #include "desktop-exec.h"
 #include "recoverable-problem.h"
 #include "proxy-socket-demangler.h"
+#include "app-info.h"
 
 static void apps_for_job (GDBusConnection * con, const gchar * name, GArray * apps, gboolean truncate_legacy);
 static void free_helper (gpointer value);
@@ -208,6 +207,19 @@
 	return click;
 }
 
+/* Determine whether an AppId is realated to a Libertine container by
+   checking the container and program name. */
+static gboolean
+is_libertine (const gchar * appid)
+{
+	if (app_info_libertine(appid, NULL, NULL)) {
+		g_debug("Libertine application detected: %s", appid);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
 static gboolean
 start_application_core (const gchar * appid, const gchar * const * uris, gboolean test)
 {
@@ -221,6 +233,14 @@
 	gboolean click = is_click(appid);
 	ual_tracepoint(libual_determine_type, appid, click ? "click" : "legacy");
 
+	/* Figure out if it is libertine */
+	gboolean libertine = FALSE;
+	if (!click) {
+		libertine = is_libertine(appid);
+	}
+
+	ual_tracepoint(libual_determine_libertine, appid, libertine ? "container" : "host");
+
 	/* Figure out the DBus path for the job */
 	const gchar * jobpath = NULL;
 	if (click) {
@@ -258,7 +278,7 @@
 	}
 
 	if (!click) {
-		if (legacy_single_instance(appid)) {
+		if (libertine || legacy_single_instance(appid)) {
 			g_variant_builder_add_value(&builder, g_variant_new_string("INSTANCE_ID="));
 		} else {
 			gchar * instanceid = g_strdup_printf("INSTANCE_ID=%" G_GUINT64_FORMAT, g_get_real_time());
@@ -274,7 +294,7 @@
 	if (click) {
 		setup_complete = click_task_setup(con, appid, (EnvHandle*)&builder);
 	} else {
-		setup_complete = desktop_task_setup(con, appid, (EnvHandle*)&builder);
+		setup_complete = desktop_task_setup(con, appid, (EnvHandle*)&builder, libertine);
 	}
 
 	if (setup_complete) {
@@ -694,7 +714,7 @@
 		return path;
 	}
 
-	if (legacy_single_instance(appid)) {
+	if (!is_libertine(appid) && legacy_single_instance(appid)) {
 		gchar * appfile = g_strdup_printf("application-legacy-%s-.log", appid);
 		path =  g_build_filename(g_get_user_cache_dir(), "upstart", appfile, NULL);
 		g_free(appfile);
@@ -1490,7 +1510,7 @@
 
 		ual_tracepoint(pids_list_finished, appid, g_list_length(pids));
 		return pids;
-	} else if (legacy_single_instance(appid)) {
+	} else if (!is_libertine(appid) && legacy_single_instance(appid)) {
 		gchar * jobname = g_strdup_printf("%s-", appid);
 		GList * pids = pids_from_cgroup(cgmanager, "application-legacy", jobname);
 		g_free(jobname);
@@ -1590,153 +1610,23 @@
 	return TRUE;
 }
 
-/* Try and get a manifest and do a couple sanity checks on it */
-static JsonObject *
-get_manifest (const gchar * pkg)
-{
-	/* Get the directory from click */
-	GError * error = NULL;
-
-	ClickDB * db = click_db_new();
-	/* If TEST_CLICK_DB is unset, this reads the system database. */
-	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_object_unref(db);
-		return NULL;
-	}
-	/* If TEST_CLICK_USER is unset, this uses the current user name. */
-	ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_object_unref(db);
-		return NULL;
-	}
-	g_object_unref(db);
-	JsonObject * manifest = click_user_get_manifest(user, pkg, &error);
-	if (error != NULL) {
-		g_warning("Unable to get manifest for '%s' package: %s", pkg, error->message);
-		g_error_free(error);
-		g_object_unref(user);
-		return NULL;
-	}
-	g_object_unref(user);
-
-	if (!json_object_has_member(manifest, "version")) {
-		g_warning("Manifest file for package '%s' does not have a version", pkg);
-		json_object_unref(manifest);
-		return NULL;
-	}
-
-	return manifest;
-}
-
-/* Types of search we can do for an app name */
-typedef enum _app_name_t app_name_t;
-enum _app_name_t {
-	APP_NAME_ONLY,
-	APP_NAME_FIRST,
-	APP_NAME_LAST
-};
-
-/* Figure out the app name if it's one of the keywords */
-static const gchar *
-manifest_app_name (JsonObject ** manifest, const gchar * pkg, const gchar * original_app)
-{
-	app_name_t app_type = APP_NAME_FIRST;
-
-	if (original_app == NULL) {
-		/* first */
-	} else if (g_strcmp0(original_app, "first-listed-app") == 0) {
-		/* first */
-	} else if (g_strcmp0(original_app, "last-listed-app") == 0) {
-		app_type = APP_NAME_LAST;
-	} else if (g_strcmp0(original_app, "only-listed-app") == 0) {
-		app_type = APP_NAME_ONLY;
-	} else {
-		return original_app;
-	}
-
-	if (*manifest == NULL) {
-		*manifest = get_manifest(pkg);
-	}
-
-	JsonObject * hooks = json_object_get_object_member(*manifest, "hooks");
-
-	if (hooks == NULL) {
-		return NULL;
-	}
-
-	GList * apps = json_object_get_members(hooks);
-	if (apps == NULL) {
-		return NULL;
-	}
-
-	const gchar * retapp = NULL;
-
-	switch (app_type) {
-	case APP_NAME_ONLY:
-		if (g_list_length(apps) == 1) {
-			retapp = (const gchar *)apps->data;
-		}
-		break;
-	case APP_NAME_FIRST:
-		retapp = (const gchar *)apps->data;
-		break;
-	case APP_NAME_LAST:
-		retapp = (const gchar *)(g_list_last(apps)->data);
-		break;
-	default:
-		break;
-	}
-
-	g_list_free(apps);
-
-	return retapp;
-}
-
-/* Figure out the app version using the manifest */
-static const gchar *
-manifest_version (JsonObject ** manifest, const gchar * pkg, const gchar * original_ver)
-{
-	if (original_ver != NULL && g_strcmp0(original_ver, "current-user-version") != 0) {
-		return original_ver;
-	} else  {
-		if (*manifest == NULL) {
-			*manifest = get_manifest(pkg);
-		}
-		g_return_val_if_fail(*manifest != NULL, NULL);
-
-		return g_strdup(json_object_get_string_member(*manifest, "version"));
-	}
-
-	return NULL;
-}
-
+/* Figure out whether we're a libertine container app or a click and then
+   choose which function to use */
 gchar *
 ubuntu_app_launch_triplet_to_app_id (const gchar * pkg, const gchar * app, const gchar * ver)
 {
 	g_return_val_if_fail(pkg != NULL, NULL);
 
-	const gchar * version = NULL;
-	const gchar * application = NULL;
-	JsonObject * manifest = NULL;
-
-	version = manifest_version(&manifest, pkg, ver);
-	g_return_val_if_fail(version != NULL, NULL);
-
-	application = manifest_app_name(&manifest, pkg, app);
-	g_return_val_if_fail(application != NULL, NULL);
-
-	gchar * retval = g_strdup_printf("%s_%s_%s", pkg, application, version);
-
-	/* The object may hold allocation for some of our strings used above */
-	if (manifest)
-		json_object_unref(manifest);
-
-	return retval;
+	/* Check if is a libertine container */
+	gchar * libertinepath = g_build_filename(g_get_user_cache_dir(), "libertine-container", pkg, NULL);
+	gboolean libcontainer = g_file_test(libertinepath, G_FILE_TEST_EXISTS);
+	g_free(libertinepath);
+
+	if (libcontainer) {
+		return libertine_triplet_to_app_id(pkg, app, ver);
+	} else {
+		return click_triplet_to_app_id(pkg, app, ver);
+	}
 }
 
 /* Print an error if we couldn't start it */

=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2015-08-11 22:16:34 +0000
+++ tests/exec-util-test.cc	2015-08-11 22:16:35 +0000
@@ -40,6 +40,9 @@
 		virtual void SetUp() {
 			g_setenv("UPSTART_JOB", "made-up-job", TRUE);
 			g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
+			g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
+			g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/libertine-home", TRUE);
+			g_setenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH", "libertine-launch", TRUE);
 
 			service = dbus_test_service_new(NULL);
 
@@ -279,3 +282,37 @@
 			EXPECT_STREQ("0", value); }},
 	});
 }
+
+TEST_F(ExecUtil, LibertineExec)
+{
+	StartCheckEnv("container-name_test_0.0", {
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("libertine-launch \"container-name\" test", value); }},
+		{"APP_EXEC_POLICY", [](const gchar * value) {
+			EXPECT_STREQ("unconfined", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("container-name_test_0.0", value); }},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+		{"INSTANCE_ID", nocheck},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("1", value); }},
+	});
+}
+
+TEST_F(ExecUtil, LibertineExecUser)
+{
+	StartCheckEnv("container-name_user-app_0.0", {
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("libertine-launch \"container-name\" user-app", value); }},
+		{"APP_EXEC_POLICY", [](const gchar * value) {
+			EXPECT_STREQ("unconfined", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("container-name_user-app_0.0", value); }},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+		{"INSTANCE_ID", nocheck},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("1", value); }},
+	});
+}

=== added directory 'tests/libertine-data'
=== added directory 'tests/libertine-data/libertine-container'
=== added directory 'tests/libertine-data/libertine-container/container-name'
=== added directory 'tests/libertine-data/libertine-container/container-name/rootfs'
=== added directory 'tests/libertine-data/libertine-container/container-name/rootfs/usr'
=== added directory 'tests/libertine-data/libertine-container/container-name/rootfs/usr/share'
=== added directory 'tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications'
=== added file 'tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop'
--- tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop	1970-01-01 00:00:00 +0000
+++ tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop	2015-08-11 22:16:35 +0000
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Test
+Type=Application
+Exec=test

=== added directory 'tests/libertine-home'
=== added directory 'tests/libertine-home/libertine-container'
=== added directory 'tests/libertine-home/libertine-container/user-data'
=== added directory 'tests/libertine-home/libertine-container/user-data/container-name'
=== added directory 'tests/libertine-home/libertine-container/user-data/container-name/.local'
=== added directory 'tests/libertine-home/libertine-container/user-data/container-name/.local/share'
=== added directory 'tests/libertine-home/libertine-container/user-data/container-name/.local/share/applications'
=== added file 'tests/libertine-home/libertine-container/user-data/container-name/.local/share/applications/user-app.desktop'
--- tests/libertine-home/libertine-container/user-data/container-name/.local/share/applications/user-app.desktop	1970-01-01 00:00:00 +0000
+++ tests/libertine-home/libertine-container/user-data/container-name/.local/share/applications/user-app.desktop	2015-08-11 22:16:35 +0000
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=User App
+Type=Application
+Exec=user-app

=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2015-06-04 20:22:27 +0000
+++ tests/libual-test.cc	2015-08-11 22:16:35 +0000
@@ -84,7 +84,8 @@
 			g_free(linkfarmpath);
 
 			g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
-			g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR, TRUE);
+			g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
+			g_setenv("XDG_DATA_HOME",  CMAKE_SOURCE_DIR "/libertine-home", TRUE);
 
 			service = dbus_test_service_new(NULL);
 
@@ -435,18 +436,22 @@
 
 }
 
+/* NOTE: The fact that there is 'libertine-data' in these strings is because
+   we're using one CACHE_HOME for this test suite and the libertine functions
+   need to pull things from there, where these are only comparisons. It's just
+   what value is in the environment variable */
 TEST_F(LibUAL, ApplicationLog)
 {
 	gchar * click_log = ubuntu_app_launch_application_log_path("com.test.good_application_1.2.3");
-	EXPECT_STREQ(CMAKE_SOURCE_DIR "/upstart/application-click-com.test.good_application_1.2.3.log", click_log);
+	EXPECT_STREQ(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-click-com.test.good_application_1.2.3.log", click_log);
 	g_free(click_log);
 
 	gchar * legacy_single = ubuntu_app_launch_application_log_path("single");
-	EXPECT_STREQ(CMAKE_SOURCE_DIR "/upstart/application-legacy-single-.log", legacy_single);
+	EXPECT_STREQ(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-legacy-single-.log", legacy_single);
 	g_free(legacy_single);
 
 	gchar * legacy_multiple = ubuntu_app_launch_application_log_path("bar");
-	EXPECT_STREQ(CMAKE_SOURCE_DIR "/upstart/application-legacy-bar-2342345.log", legacy_multiple);
+	EXPECT_STREQ(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-legacy-bar-2342345.log", legacy_multiple);
 	g_free(legacy_multiple);
 }
 
@@ -529,6 +534,12 @@
 	EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("com.test.no-json", NULL, NULL));
 	EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("com.test.no-object", NULL, NULL));
 	EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("com.test.no-version", NULL, NULL));
+
+	/* Libertine tests */
+	EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("container-name", NULL, NULL));
+	EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("container-name", "not-exist", NULL));
+	EXPECT_STREQ("container-name_test_0.0", ubuntu_app_launch_triplet_to_app_id("container-name", "test", NULL));
+	EXPECT_STREQ("container-name_user-app_0.0", ubuntu_app_launch_triplet_to_app_id("container-name", "user-app", NULL));
 }
 
 TEST_F(LibUAL, AppIdParse)