From 97169fc1c9c493e829aa81d36b30f38583f4afc1 Mon Sep 17 00:00:00 2001
From: quapka
Date: Fri, 9 Aug 2024 16:35:52 +0200
Subject: Fallback to HOME enviromental var

---
 common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
index da682b6..982dbed 100644
--- a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
@@ -50,10 +50,10 @@ public class FileUtil {
                 if (dataHome != null) {
                     appData = Paths.get(dataHome);
                 } else {
-                    appData = Paths.get(System.getProperty("user.home"), ".local", "share");
+                    appData = Paths.get(System.getenv("HOME"), ".local", "share");
                 }
             } else {
-                appData = Paths.get(System.getProperty("user.home"), ".local", "share");
+                appData = Paths.get(System.getenv("HOME"), ".local", "share");
             }
         }
         return appData;
-- 
cgit v1.2.3-70-g09d2


From 1fcbe537eefeaebfda7403b166e92278941ddf20 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Fri, 9 Aug 2024 17:00:43 +0200
Subject: Fallback only if user.home is junk.

---
 common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
index 982dbed..734e957 100644
--- a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
@@ -44,14 +44,18 @@ public class FileUtil {
 
         if (System.getProperty("os.name").startsWith("Windows")) {
             appData = Paths.get(System.getenv("AppData"));
+            return appData;
         } else {
             if (System.getProperty("os.name").startsWith("Linux")) {
                 String dataHome = System.getenv("XDG_DATA_HOME");
                 if (dataHome != null) {
                     appData = Paths.get(dataHome);
-                } else {
-                    appData = Paths.get(System.getenv("HOME"), ".local", "share");
+                    return appData;
                 }
+            }
+            String userHome = System.getProperty("user.home");
+            if (userHome != null && !userHome.equals("?")) {
+                appData = Paths.get(userHome, ".local", "share");
             } else {
                 appData = Paths.get(System.getenv("HOME"), ".local", "share");
             }
-- 
cgit v1.2.3-70-g09d2