From bcf58bc8e42d216d43f268d23b8443c8f3ac115b Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 21 May 2025 06:01:42 +0000 Subject: [PATCH] Improve userprofile check robustness --- .../src/main/java/io/xpipe/core/process/OsType.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/io/xpipe/core/process/OsType.java b/core/src/main/java/io/xpipe/core/process/OsType.java index 285299803..405c4bbe5 100644 --- a/core/src/main/java/io/xpipe/core/process/OsType.java +++ b/core/src/main/java/io/xpipe/core/process/OsType.java @@ -62,8 +62,19 @@ public interface OsType { @Override public String getUserHomeDirectory(ShellControl pc) throws Exception { - return pc.executeSimpleStringCommand( + var profile = pc.executeSimpleStringCommand( pc.getShellDialect().getPrintEnvironmentVariableCommand("USERPROFILE")); + if (!profile.isEmpty()) { + return profile; + } + + var name = pc.executeSimpleStringCommand( + pc.getShellDialect().getPrintEnvironmentVariableCommand("USERNAME")); + if (!name.isEmpty()) { + return "C:\\Users\\" + name; + } + + return "C:\\Users\\User"; } @Override