Fixes [stage]

app/src/main/java/io/xpipe/app/core/AppExtensionManager.java

@@ -56,7 +56,7 @@ public class AppExtensionManager {
         return INSTANCE;
     }
 
-    private static String getLocalInstallVersion(AppInstallation localInstallation) throws Exception {
+    private static String getLocalInstallVersion(AppInstallation localInstallation) {
         var exec = localInstallation.getDaemonExecutablePath();
         var out = LocalExec.readStdoutIfPossible(exec.toString(), "version");
         return out.orElseThrow().strip();
@@ -81,7 +81,7 @@ public class AppExtensionManager {
             Path p = localInstallation.getBaseInstallationPath();
             if (!Files.exists(p)) {
                 throw new IllegalStateException(
-                        "Required local XPipe installation was not found but is required for development. See https://github"
+                        "Required local " + AppNames.ofCurrent().getName() + " installation was not found but is required for development. See https://github"
                                 + ".com/xpipe-io/xpipe/blob/master/CONTRIBUTING.md#development-setup");
             }
 

app/src/main/java/io/xpipe/app/core/AppProperties.java

@@ -110,7 +110,6 @@ public class AppProperties {
                     return p;
                 })
                 .orElse(defaultDataDir);
-        dataBinDir = dataDir.resolve("bin");
         showcase = Optional.ofNullable(System.getProperty(AppNames.propertyName("showcase")))
                 .map(Boolean::parseBoolean)
                 .orElse(false);
@@ -139,6 +138,7 @@ public class AppProperties {
         // We require the user dir from here
         AppUserDirectoryCheck.check(dataDir);
         AppCache.setBasePath(dataDir.resolve("cache"));
+        dataBinDir = dataDir.resolve("cache", "bin");
         UUID id = AppCache.getNonNull("uuid", UUID.class, () -> null);
         if (id == null) {
             uuid = UUID.randomUUID();

app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java

@@ -4,6 +4,7 @@ import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.MarkdownComp;
 import io.xpipe.app.comp.base.ModalButton;
 import io.xpipe.app.comp.base.ModalOverlay;
+import io.xpipe.app.core.AppNames;
 import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.core.AppResources;
 import io.xpipe.app.util.WindowsRegistry;
@@ -71,7 +72,7 @@ public class AppAvCheck {
         BITDEFENDER("Bitdefender") {
             @Override
             public String getDescription() {
-                return "Bitdefender sometimes isolates XPipe and some shell programs, effectively making it unusable.";
+                return "Bitdefender sometimes isolates " + AppNames.ofCurrent().getName() + " and some shell programs, effectively making it unusable.";
             }
 
             @Override

app/src/main/java/io/xpipe/app/core/check/AppDebugModeCheck.java

@@ -16,7 +16,7 @@ public class AppDebugModeCheck {
                 """
 
                   ****************************************
-                  * You are running XPipe in debug mode! *
+                  * You are running in debug mode!       *
                   * The debug console output can contain *
                   * sensitive information and secrets.   *
                   * Don't share this output via an       *

app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java

@@ -1,5 +1,6 @@
 package io.xpipe.app.core.check;
 
+import io.xpipe.app.core.AppNames;
 import io.xpipe.app.issue.ErrorEventFactory;
 import io.xpipe.core.FilePath;
 import io.xpipe.core.OsType;
@@ -33,7 +34,7 @@ public class AppHomebrewCoreutilsCheck {
             ErrorEventFactory.fromMessage(
                             "You have the homebrew coreutils package installed and added to your PATH at " + loc.get()
                                     + "."
-                                    + " The coreutils commands overwrite and are incompatible to the native macOS commands, which XPipe expects."
+                                    + " The coreutils commands overwrite and are incompatible to the native macOS commands, which " + AppNames.ofCurrent().getName() + " expects."
                                     + " Please remove the coreutils commands from your PATH prior to launching XPipe.")
                     .term()
                     .handle();

app/src/main/java/io/xpipe/app/core/check/AppJavaOptionsCheck.java

@@ -1,6 +1,7 @@
 package io.xpipe.app.core.check;
 
 import io.xpipe.app.core.AppCache;
+import io.xpipe.app.core.AppNames;
 import io.xpipe.app.issue.ErrorEventFactory;
 
 public class AppJavaOptionsCheck {
@@ -18,7 +19,7 @@ public class AppJavaOptionsCheck {
         ErrorEventFactory.fromMessage(
                         "You have configured the global environment variable _JAVA_OPTIONS=%s on your system."
                                         .formatted(env)
-                                + " This will forcefully apply all custom JVM options to XPipe and can cause a variety of different issues."
+                                + " This will forcefully apply all custom JVM options to " + AppNames.ofCurrent().getName() + " and can cause a variety of different issues."
                                 + " Please remove this global environment variable and use local configuration instead for your other JVM programs.")
                 .expected()
                 .handle();

app/src/main/java/io/xpipe/app/core/check/AppShellCheck.java

@@ -1,5 +1,6 @@
 package io.xpipe.app.core.check;
 
+import io.xpipe.app.core.AppNames;
 import io.xpipe.core.OsType;
 
 public class AppShellCheck {
@@ -58,7 +59,7 @@ public class AppShellCheck {
                             protected String modifyOutput(String output) {
                                 if (output.contains("is not recognized as an internal or external command")
                                         && output.contains("exec-")) {
-                                    return "Unable to create temporary script files. XPipe needs to be able to create shell script files that can be launched "
+                                    return "Unable to create temporary script files. " + AppNames.ofCurrent().getName() + " needs to be able to create shell script files that can be launched "
                                             + "by a terminal emulator to make terminal launches work.";
                                 }
 

app/src/main/java/io/xpipe/app/core/check/AppTestCommandCheck.java

@@ -1,6 +1,7 @@
 package io.xpipe.app.core.check;
 
 import io.xpipe.app.core.AppInstallation;
+import io.xpipe.app.core.AppNames;
 import io.xpipe.app.process.ProcessOutputException;
 import io.xpipe.app.util.LocalShell;
 import io.xpipe.core.OsType;
@@ -23,7 +24,7 @@ public class AppTestCommandCheck {
                         .execute();
             } catch (ProcessOutputException ex) {
                 throw ProcessOutputException.withPrefix(
-                        "Installation self test failed. Is your \"test\" shell command working as expected and is the XPipe installation directory "
+                        "Installation self test failed. Is your \"test\" shell command working as expected and is the " + AppNames.ofCurrent().getName() + " installation directory "
                                 + "accessible?",
                         ex);
             }

app/src/main/java/io/xpipe/app/ext/ExtensionException.java

@@ -1,6 +1,7 @@
 package io.xpipe.app.ext;
 
 import io.xpipe.app.core.AppInstallation;
+import io.xpipe.app.core.AppNames;
 
 public class ExtensionException extends RuntimeException {
 
@@ -26,10 +27,10 @@ public class ExtensionException extends RuntimeException {
         try {
             var loc = AppInstallation.ofCurrent().getBaseInstallationPath();
             var full =
-                    message + ".\n\n" + "Please check whether the XPipe installation data at " + loc + " is corrupted.";
+                    message + ".\n\n" + "Please check whether the " + AppNames.ofCurrent().getName() + " installation data at " + loc + " is corrupted.";
             return new ExtensionException(full, cause);
         } catch (Throwable t) {
-            var full = message + ".\n\n" + "Please check whether the XPipe installation data is corrupted.";
+            var full = message + ".\n\n" + "Please check whether the " + AppNames.ofCurrent().getName() + " installation data is corrupted.";
             return new ExtensionException(full, cause);
         }
     }

app/src/main/java/io/xpipe/app/prefs/AppPrefs.java

@@ -353,11 +353,11 @@ public final class AppPrefs {
         return alwaysShowSshMotd;
     }
 
-    public final ObservableBooleanValue preferTerminalTabs() {
+    public ObservableBooleanValue preferTerminalTabs() {
         return preferTerminalTabs;
     }
 
-    public final ObservableValue<List<SystemIconSource>> getIconSources() {
+    public ObservableValue<List<SystemIconSource>> getIconSources() {
         return iconSources;
     }
 

build.gradle

@@ -94,7 +94,7 @@ def getJvmArgs() {
     def jvmRunArgs = [
             "-Dio.xpipe.app.arch=$arch",
             "-Dfile.encoding=UTF-8",
-            "-Dvisualvm.display.name=XPipe",
+            "-Dvisualvm.display.name=$productName",
             "-Djavafx.preloader=io.xpipe.app.core.AppPreloader",
             "-Djdk.virtualThreadScheduler.parallelism=8"
     ]

dist/jpackage.gradle

@@ -17,7 +17,7 @@ def releaseArguments = distJvmArgs + [
 ]
 
 if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
-    releaseArguments += '-Xdock:name=XPipe'
+    releaseArguments += "-Xdock:name=$productName"
 }
 
 if (isFullRelease || isStage) {

version

@@ -1 +1 @@
-18.0-14
+18.0-15