From 18992c2fa0dfdcc93b516f3cb3a22f19d9af4c43 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 17 May 2016 11:55:41 +0200
Subject: [PATCH] Look at FLATPAK_SYSTEM_DIR env var for default system dir

This is useful for testing
---
 common/flatpak-dir.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 017f4b7c..736a5ec5 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -178,7 +178,20 @@ flatpak_deploy_new (GFile *dir, GKeyFile *metadata)
 GFile *
 flatpak_get_system_base_dir_location (void)
 {
-  return g_file_new_for_path (FLATPAK_SYSTEMDIR);
+  static gsize path = 0;
+
+  if (g_once_init_enter (&path))
+    {
+      gsize setup_value = 0;
+      const char *system_dir = g_getenv ("FLATPAK_SYSTEM_DIR");
+      if (system_dir != NULL)
+        setup_value = (gsize)system_dir;
+      else
+        setup_value = (gsize)FLATPAK_SYSTEMDIR;
+      g_once_init_leave (&path, setup_value);
+     }
+
+  return g_file_new_for_path ((char *)path);
 }
 
 GFile *