mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-24 00:21:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
crschnick
2024-08-24 12:40:00 +00:00
parent 4adb18249b
commit d6cb3bf2bd
16 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/io/xpipe/core/process/OsType.java
View File

@@ -28,7 +28,7 @@ public interface OsType {
List<String> determineInterestingPaths(ShellControl pc) throws Exception;
String getHomeDirectory(ShellControl pc) throws Exception;
String getUserHomeDirectory(ShellControl pc) throws Exception;
String getFileSystemSeparator();
@@ -55,7 +55,7 @@ public interface OsType {
@Override
public List<String> determineInterestingPaths(ShellControl pc) throws Exception {
var home = getHomeDirectory(pc);
var home = getUserHomeDirectory(pc);
return List.of(
home,
FileNames.join(home, "Documents"),
@@ -64,7 +64,7 @@ public interface OsType {
}
@Override
public String getHomeDirectory(ShellControl pc) throws Exception {
public String getUserHomeDirectory(ShellControl pc) throws Exception {
return pc.executeSimpleStringCommand(
pc.getShellDialect().getPrintEnvironmentVariableCommand("USERPROFILE"));
}
@@ -95,10 +95,10 @@ public interface OsType {
@Override
public List<String> determineInterestingPaths(ShellControl pc) throws Exception {
var home = getHomeDirectory(pc);
var home = getUserHomeDirectory(pc);
return List.of(
home,
"/home",
FileNames.getParent(home),
FileNames.join(home, "Downloads"),
FileNames.join(home, "Documents"),
"/etc",
@@ -107,7 +107,7 @@ public interface OsType {
}
@Override
public String getHomeDirectory(ShellControl pc) throws Exception {
public String getUserHomeDirectory(ShellControl pc) throws Exception {
return pc.executeSimpleStringCommand(pc.getShellDialect().getPrintEnvironmentVariableCommand("HOME"));
}
@@ -149,7 +149,7 @@ public interface OsType {
@Override
public List<String> determineInterestingPaths(ShellControl pc) throws Exception {
var home = getHomeDirectory(pc);
var home = getUserHomeDirectory(pc);
return List.of(
home,
FileNames.join(home, "Downloads"),
@@ -162,7 +162,7 @@ public interface OsType {
}
@Override
public String getHomeDirectory(ShellControl pc) throws Exception {
public String getUserHomeDirectory(ShellControl pc) throws Exception {
return pc.executeSimpleStringCommand(pc.getShellDialect().getPrintEnvironmentVariableCommand("HOME"));
}

1
core/src/main/java/module-info.java
View File

@@ -17,7 +17,6 @@ open module io.xpipe.core {
requires com.fasterxml.jackson.databind;
requires java.net.http;
requires static lombok;
requires java.sql;
uses com.fasterxml.jackson.databind.Module;
uses ProcessControlProvider;