From a458f6ffe58d4efaabcc33c08326eb6722019a17 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 26 Apr 2023 14:34:59 +0000 Subject: [PATCH] Better separate staging environment [stage] --- app/src/main/java/io/xpipe/app/core/App.java | 3 +- .../java/io/xpipe/app/core/AppProperties.java | 4 +++ .../io/xpipe/app/update/AppDownloads.java | 2 +- dist/changelogs/0.5.38.md | 31 +++++++++++++++++++ dist/jpackage.gradle | 1 + 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 dist/changelogs/0.5.38.md diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java index ae19f5e6c..db68063ef 100644 --- a/app/src/main/java/io/xpipe/app/core/App.java +++ b/app/src/main/java/io/xpipe/app/core/App.java @@ -74,6 +74,7 @@ public class App extends Application { () -> { var base = String.format( "X-Pipe Desktop (%s)", AppProperties.get().getVersion()); + var prefix = AppProperties.get().isStaging() ? "[STAGE] " : ""; var suffix = XPipeDistributionType.get().getUpdateHandler().getPreparedUpdate().getValue() != null ? String.format( " (Update to %s ready)", @@ -82,7 +83,7 @@ public class App extends Application { .getValue() .getVersion()) : ""; - return base + suffix; + return prefix + base + suffix; }, XPipeDistributionType.get().getUpdateHandler().getPreparedUpdate()); diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 87fb1e613..4fa914941 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -25,6 +25,7 @@ public class AppProperties { UUID buildUuid; String sentryUrl; boolean image; + boolean staging; Path dataDir; public AppProperties() { @@ -51,6 +52,9 @@ public class AppProperties { .orElse(UUID.randomUUID()); sentryUrl = System.getProperty("io.xpipe.app.sentryUrl"); dataDir = parseDataDir(); + staging = Optional.ofNullable(System.getProperty("io.xpipe.app.staging")) + .map(Boolean::parseBoolean) + .orElse(false); } public static void logSystemProperties() { diff --git a/app/src/main/java/io/xpipe/app/update/AppDownloads.java b/app/src/main/java/io/xpipe/app/update/AppDownloads.java index 86272add3..a7e4fbc25 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDownloads.java +++ b/app/src/main/java/io/xpipe/app/update/AppDownloads.java @@ -33,7 +33,7 @@ public class AppDownloads { .withRateLimitHandler(RateLimitHandler.FAIL) .withAuthorizationProvider(AuthorizationProvider.ANONYMOUS) .build(); - repository = github.getRepository("xpipe-io/xpipe"); + repository = github.getRepository(AppProperties.get().isStaging() ? "xpipe-io/xpipe_staging" : "xpipe-io/xpipe"); return repository; } diff --git a/dist/changelogs/0.5.38.md b/dist/changelogs/0.5.38.md new file mode 100644 index 000000000..471372645 --- /dev/null +++ b/dist/changelogs/0.5.38.md @@ -0,0 +1,31 @@ +## Changes in 0.5.38 +- Fix PowerShell Core launch timeouts due to ANSI escapes codes +- Fix NullPointerException when using Powershell connection as host for SSH connection +- Check whether SSH client is installed prior to calling it +- Report underlying error when terminal open fails +- Fix various small bugs + +## Changes in 0.5.37 +- Add experimental support for Kubernetes clusters and pods +- Add ability to expand and collapse children list of connections +- Fix PowerShell Remote Session file updates not working +- Fix default terminal detection on macOS choosing wrong terminal +- Improve error messages when launching external programs +- Fix various small bugs + +## Changes in 0.5.36 +- Add support to lock your workspace with a custom password similar to password managers. + This will encrypt all stored sensitive information using the password as the key. + The general password encryption has also been reworked, which results in all existing passwords becoming invalid. + So make sure to reenter your passwords for any connection. +- Add experimental support for PowerShell Remote connections +- Add support for PowerShell core shell environments +- Improve file browser performance +- Improve initial connection startup after being added +- Implement initial support for future package manager builds +- Rework updating system to accommodate package managers +- Improve error handling +- Improve error display in connection creation +- Fix many bugs + +So don't forget to reenter your passwords for all connection. diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle index 886d28d26..59537f77c 100644 --- a/dist/jpackage.gradle +++ b/dist/jpackage.gradle @@ -8,6 +8,7 @@ def releaseArguments = distJvmArgs + [ '-Dio.xpipe.app.writeLogs=true', "-Dio.xpipe.app.buildId=$rootProject.buildId", "-Dio.xpipe.app.fullVersion=$rootProject.fullVersion", + "-Dio.xpipe.app.staging=$rootProject.isStage", '-Dio.xpipe.app.sentryUrl=https://fd5f67ff10764b7e8a704bec9558c8fe@o1084459.ingest.sentry.io/6094279' ]