From 1e30ca595cdfe8d5e9a364c87c26ef39d2bd80fa Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 13 Apr 2023 03:23:07 +0000 Subject: [PATCH] More staging fixes [stage] --- .../java/io/xpipe/app/update/XPipeDistributionType.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java b/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java index 33f1a5032..ff97b092f 100644 --- a/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java +++ b/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java @@ -4,6 +4,8 @@ import io.xpipe.app.core.AppCache; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.XPipeSession; import io.xpipe.core.impl.LocalStore; +import io.xpipe.core.util.ModuleHelper; +import io.xpipe.core.util.XPipeInstallation; import lombok.Getter; import java.util.Arrays; @@ -27,6 +29,9 @@ public enum XPipeDistributionType { return type; } + if (!ModuleHelper.isImage()) { + return (type = DEVELOPMENT); + } if (!XPipeSession.get().isNewBuildSession()) { var cached = AppCache.get("dist", String.class, () -> null); @@ -46,6 +51,10 @@ public enum XPipeDistributionType { } public static XPipeDistributionType determine() { + if (!XPipeInstallation.isInstallationDistribution()) { + return (type = PORTABLE); + } + try (var sc = LocalStore.getShell()) { try (var chocoOut = sc.command("choco search --local-only -r xpipe").start()) { var out = chocoOut.readStdoutDiscardErr();