Rework and complete xdg directories management

Create all of them, never delete them, move stuff that make
sense in there.

3 files changed, 20 insertions, 20 deletions

diff --git a/devbot/config.py b/devbot/config.py
index e17f13d..f18d8f9 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -20,11 +20,13 @@ share_dir = None
 bin_dir = None
 etc_dir = None
 libexec_dir = None
-home_dir = None
 dep_files = None
 package_files = None
 prefs_path = None
 system_lib_dirs = None
+cache_home_dir = None
+config_home_dir = None
+data_home_dir = None
 
 _source_dir = None
 _build_dir = None
@@ -87,9 +89,19 @@ def set_logs_dir(dir):
     _ensure_dir(logs_dir)
 
 def set_home_dir(dir):
-    global home_dir
-    home_dir = dir
-    _ensure_dir(home_dir)
+    _ensure_dir(dir)
+
+    global cache_home_dir
+    cache_home_dir = os.path.join(dir, "cache")
+    _ensure_dir(cache_home_dir)
+
+    global config_home_dir
+    config_home_dir = os.path.join(dir, "config")
+    _ensure_dir(config_home_dir)
+
+    global data_home_dir
+    data_home_dir = os.path.join(dir, "data")
+    _ensure_dir(data_home_dir)
 
 def _get_prefix_dir(dir, relocatable):
     real_prefix_path = os.path.join(dir, "real_prefix")
@@ -283,7 +295,6 @@ def load_modules():
 
 def clean():
     try:
-        os.rmdir(home_dir)
         os.rmdir(logs_dir)
     except OSError:
         pass
diff --git a/devbot/environ.py b/devbot/environ.py
index a2ac610..2afc49f 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -21,14 +21,10 @@ def _add_path(name, path):
 
     os.environ[name] = ":".join(splitted)
 
-def _get_gst_registry_path():
-    return os.path.join(config.home_dir, "gstreamer.registry")
-
 def _setup_variables():
     _add_path("LD_LIBRARY_PATH", config.lib_dir)
     _add_path("PATH", config.bin_dir)
     _add_path("PATH", config.commands_dir)
-    _add_path("GST_REGISTRY", _get_gst_registry_path())
 
     _add_path("ACLOCAL_PATH",
               os.path.join(config.share_dir, "aclocal"))  
@@ -66,8 +62,9 @@ def _setup_variables():
  
     os.environ["GTK_DATA_PREFIX"] = config.prefix_dir
     os.environ["GTK_PATH"] = os.path.join(config.lib_dir, "gtk-2.0")
-    os.environ["XDG_DATA_HOME"] = os.path.join(config.home_dir, "data")
-    os.environ["XDG_CONFIG_HOME"] = os.path.join(config.home_dir, "config")
+    os.environ["XDG_CACHE_HOME"] = config.cache_home_dir
+    os.environ["XDG_DATA_HOME"] = config.data_home_dir
+    os.environ["XDG_CONFIG_HOME"] = config.config_home_dir
     os.environ["CC"] = "ccache gcc"
 
     profile = config.get_pref("PROFILE")
@@ -98,11 +95,3 @@ def _setup_gconf():
 
     os.environ["GCONF_SCHEMA_INSTALL_SOURCE"] = \
         "xml:merged:" + os.path.join(gconf_dir, "gconf.xml.defaults")
-
-def clean():
-    print "Deleting registry"
-
-    try:
-        os.unlink(_get_gst_registry_path())
-    except OSError:
-        pass
diff --git a/devbot/state.py b/devbot/state.py
index 9bca7d2..03d249e 100644
--- a/devbot/state.py
+++ b/devbot/state.py
@@ -6,7 +6,7 @@ from devbot import config
 _state = None
 
 def _get_state_path():
-    return os.path.join(config.home_dir, "state.json")
+    return os.path.join(config.data_home_dir, "state.json")
 
 def _get_state():
     global _state