lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-25 01:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

AppImage fixes [stage]

Browse Source
This commit is contained in:
crschnick
2025-11-05 00:10:45 +00:00
parent 57c0336e6e
commit 2e703322fe
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/core/AppRestart.java
+10 -2
View File
@@ -4,6 +4,8 @@ import io.xpipe.app.core.mode.AppOperationMode;
import io.xpipe.app.process.LocalShell;
import io.xpipe.app.process.ShellDialect;
import io.xpipe.app.process.ShellDialects;
import io.xpipe.app.update.AppDistributionType;
import io.xpipe.app.util.DesktopShortcuts;
import io.xpipe.core.OsType;
import java.util.List;
@@ -15,7 +17,10 @@ public class AppRestart {
? AppInstallation.ofDefault()
: AppInstallation.ofCurrent();
var suffix = (arguments.size() > 0 ? " " + String.join(" ", arguments) : "");
if (OsType.ofLocal() == OsType.LINUX) {
if (AppDistributionType.get() == AppDistributionType.APP_IMAGE) {
var exec = System.getenv("APPIMAGE");
return "nohup \"" + exec + "\"" + suffix + " </dev/null >/dev/null 2>&1 & disown";
} else if (OsType.ofLocal() == OsType.LINUX) {
var exec = loc.getCliExecutablePath();
return "\"" + exec + "\" open" + suffix;
} else if (OsType.ofLocal() == OsType.MACOS) {
@@ -40,7 +45,10 @@ public class AppRestart {
? AppInstallation.ofDefault()
: AppInstallation.ofCurrent();
var suffix = (arguments.size() > 0 ? " " + String.join(" ", arguments) : "");
if (OsType.ofLocal() == OsType.LINUX) {
if (AppDistributionType.get() == AppDistributionType.APP_IMAGE) {
var exec = System.getenv("APPIMAGE");
return "nohup \"" + exec + "\"" + suffix + " </dev/null >/dev/null 2>&1 & disown";
} else if (OsType.ofLocal() == OsType.LINUX) {
return "nohup \"" + loc.getDaemonExecutablePath() + "\"" + suffix + " </dev/null >/dev/null 2>&1 & disown";
} else if (OsType.ofLocal() == OsType.MACOS) {
return "(sleep 1;open \"" + loc.getBaseInstallationPath() + "\" --args" + suffix
app/src/main/java/io/xpipe/app/prefs/WorkspaceCreationDialog.java
+11
View File
@@ -8,6 +8,7 @@ import io.xpipe.app.core.AppProperties;
import io.xpipe.app.core.mode.AppOperationMode;
import io.xpipe.app.issue.ErrorEventFactory;
import io.xpipe.app.platform.OptionsBuilder;
import io.xpipe.app.update.AppDistributionType;
import io.xpipe.app.util.*;
import io.xpipe.core.OsType;
@@ -63,6 +64,16 @@ public class WorkspaceCreationDialog {
shortcutName);
}
default -> {
// AppImages are mounted and can't be called normally
if (AppDistributionType.get() == AppDistributionType.APP_IMAGE) {
var exec = System.getenv("APPIMAGE");
yield DesktopShortcuts.create(
exec,
"-Dio.xpipe.app.dataDir=\"" + path.get()
+ "\" -Dio.xpipe.app.acceptEula=true",
shortcutName);
}
var exec = AppInstallation.ofCurrent()
.getCliExecutablePath()
.toString();
app/src/main/java/io/xpipe/app/update/AppDistributionType.java
+5
View File
@@ -22,6 +22,7 @@ public enum AppDistributionType implements Translatable {
DEVELOPMENT("development", true, () -> new GitHubUpdater(false)),
PORTABLE("portable", false, () -> new PortableUpdater(true)),
NATIVE_INSTALLATION("install", true, () -> new GitHubUpdater(true)),
APP_IMAGE("appImage", false, () -> new PortableUpdater(true)),
HOMEBREW("homebrew", true, () -> {
var pkg = AppNames.ofCurrent().getKebapName();
return new CommandUpdater(
@@ -163,6 +164,10 @@ public enum AppDistributionType implements Translatable {
return SCOOP;
}
if (OsType.ofLocal() == OsType.LINUX && base.toString().startsWith("/mnt") && System.getenv("APPIMAGE") != null) {
return APP_IMAGE;
}
return PORTABLE;
}
}
lang/strings/fixed_en.properties
Generated
+2 -1
View File
@@ -146,4 +146,5 @@ scoop=Scoop
vsCodium=VSCodium
freeRdp=FreeRDP
tailscale=Tailscale
netbird=Netbird
netbird=Netbird
appImageDist=AppImage
version
+1 -1
View File
@@ -1 +1 @@
19.0-8
19.0-9