lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-26 18:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flatpak fixes

Browse Source
This commit is contained in:
crschnick
2025-10-25 08:36:21 +00:00
parent 1834956902
commit 8a242dba6a
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java
+1 -1
View File
@@ -139,7 +139,7 @@ public interface ExternalApplicationType extends PrefsValue {
}
try (ShellControl pc = LocalShell.getShell()) {
args.add(0, "flatpak", "run", "\"" + getFlatpakId() + "\"");
args.add(0, FlatpakCache.runCommand(getFlatpakId()));
pc.command(args).execute();
}
}
app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
+2 -2
View File
@@ -399,7 +399,7 @@ public interface ExternalEditorType extends PrefsChoiceValue {
public void launch(Path file) throws Exception {
var exec = CommandSupport.isInLocalPath(getExecutable()) ?
CommandBuilder.of().addFile(getExecutable()) :
CommandBuilder.of().add("flatpak", "run").addQuoted(getFlatpakId());
FlatpakCache.runCommand(getFlatpakId());
if (FlatpakCache.getApp(getFlatpakId()).isEmpty()) {
CommandSupport.isInPathOrThrow(LocalShell.getShell(), getExecutable());
@@ -763,7 +763,7 @@ public interface ExternalEditorType extends PrefsChoiceValue {
CommandSupport.isInPathOrThrow(LocalShell.getShell(), getExecutable());
}
var builder = CommandBuilder.of().add("flatpak", "run").addQuoted(getFlatpakId()).addFile(file.toString());
var builder = FlatpakCache.runCommand(getFlatpakId()).addFile(file.toString());
ExternalApplicationHelper.startAsync(builder);
}
}
app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
+2 -2
View File
@@ -111,7 +111,7 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
base = CommandBuilder.of().addFile("wezterm");
} else {
if (flatpak.isPresent()) {
base = CommandBuilder.of().add("flatpak", "run").addQuoted("org.wezfurlong.wezterm");
base = FlatpakCache.runCommand("org.wezfurlong.wezterm");
} else {
base = CommandBuilder.of().addFile("wezterm");
}
@@ -131,7 +131,7 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
base = CommandBuilder.of().addFile("wezterm-gui");
} else {
if (flatpak.isPresent()) {
base = CommandBuilder.of().add("flatpak", "run").addQuoted("org.wezfurlong.wezterm");
base = FlatpakCache.runCommand("org.wezfurlong.wezterm");
} else {
base = CommandBuilder.of().addFile("wezterm-gui");
}
app/src/main/java/io/xpipe/app/util/FlatpakCache.java
+4 -1
View File
@@ -42,6 +42,9 @@ public class FlatpakCache {
}
public static CommandBuilder runCommand(String id) throws Exception {
return CommandBuilder.of().add("flatpak", "run").addQuoted(id).add("--filesystem=" + AppSystemInfo.ofLinux().getTemp());
return CommandBuilder.of().add("flatpak", "run")
.add("--filesystem=" + AppSystemInfo.ofLinux().getTemp())
.add("--filesystem=host")
.addQuoted(id);
}
}