From efe75a7332941a5e2e23a3e75c197147d65a2215 Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 4 Dec 2023 23:00:05 +0000 Subject: [PATCH] Change user name query --- app/src/main/java/io/xpipe/app/browser/OpenFileSystemCache.java | 2 +- core/src/main/java/io/xpipe/core/process/ShellDialect.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemCache.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemCache.java index 0d16b5ef6..ecaf54606 100644 --- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemCache.java +++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemCache.java @@ -32,7 +32,7 @@ public class OpenFileSystemCache { public void init() throws Exception { ShellControl sc = model.getFileSystem().getShell().get(); ShellDialect d = sc.getShellDialect(); - username = sc.executeSimpleStringCommand(d.getPrintVariableCommand(d.getUsernameVariableName())); + username = d.printUsernameCommand(sc).readStdoutOrThrow(); } public boolean isRoot() { diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java index 1d9b0bf6e..d1bc3c221 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java +++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java @@ -137,7 +137,7 @@ public interface ShellDialect { String getPrintVariableCommand(String name); - String getUsernameVariableName(); + CommandControl printUsernameCommand(ShellControl shellControl); String getPrintExitCodeCommand(String prefix, String suffix);