Use XDG_CONFIG_HOME for config directory

Author: bailuk

flatpak/ch.bailu.gtk_meteo.json

@@ -7,6 +7,17 @@
     "org.freedesktop.Sdk.Extension.openjdk17"
   ],
   "command": "gtk-meteo.sh",
+  "finish-args": [
+    "--share=network",
+    "--share=ipc",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--device=dri",
+    "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
+    "--env=JAVA_HOME=/app/jre",
+    "--env=LIBO_FLATPAK=1",
+    "--env=PATH=/app/bin:/app/jre/bin"
+  ],
   "modules": [
     {
       "name": "openjdk",
@@ -22,7 +33,7 @@
         {
           "type": "git",
           "url": "https://github.com/bailuk/gtk-meteo.git",
-          "branch": "543eb0a5ff40b57d70277fb6c7ac9b3e6f9fb431"
+          "commit": "543eb0a5ff40b57d70277fb6c7ac9b3e6f9fb431"
         },
         "gradle-sources.json"
       ],
@@ -36,18 +47,5 @@
         "install -Dm644 src/main/resources/svg/app-icon.svg /app/share/icons/hicolor/scalable/apps/ch.bailu.gtk_meteo.svg"
       ]
     }
-  ],
-  "finish-args": [
-    "--share=network",
-    "--share=ipc",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--device=dri",
-    "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
-    "--env=JAVA_HOME=/app/jre",
-    "--env=LIBO_FLATPAK=1",
-    "--env=PATH=/app/bin:/app/jre/bin",
-    "--filesystem=~/.config/gtk-meteo",
-    "--filesystem=~/.java/.userPrefs/gtk-meteo"
   ]
 }

flatpak/flatpak-pin-commit.sh

@@ -5,4 +5,4 @@ git_hash=$(git show --format="%H" --no-patch)
 
 echo "_"
 echo "update '${out_file}' (commit: $git_hash)"
-sed -i 's/"branch": .*"/"branch": '\"${git_hash}\"'/g' "${out_file}"
+sed -i 's/"commit": .*"/"commit": '\"${git_hash}\"'/g' "${out_file}"

src/main/kotlin/config/Files.kt

@@ -4,10 +4,13 @@ import config.Strings.userAgent
 import java.io.File
 
 object Files {
-    val configDirectory =
-        File(System.getProperty("user.home") + "/.config/$userAgent/")
+
+    private val configHome = (System.getenv("XDG_CONFIG_HOME")
+        ?: (System.getProperty("user.home") + "/.config")) + "/$userAgent"
+    val configDirectory = File(configHome)
 
     init {
+        println("CONFIG_HOME: $configHome")
         configDirectory.mkdirs()
     }
 

src/main/kotlin/controller/Prefs.kt

@@ -1,11 +1,16 @@
 package controller
 
+import config.Files
 import config.Keys
 import java.util.prefs.Preferences
 
 object Prefs {
-    private val prefs = Preferences.userRoot().node("gtk-meteo")
+    private val prefs: Preferences
 
+    init {
+        System.setProperty("java.util.prefs.userRoot", Files.configDirectory.path)
+        prefs = Preferences.userRoot().node("gtk-meteo")
+    }
     fun putAutoCycle(value: Boolean) {
         prefs.putBoolean(Keys.AUTO_CYCLE, value)
     }