CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-30 00:56:56 +13:00
Code Issues Projects Releases Packages Wiki Activity

Add arch information

Browse source
This commit is contained in:
crschnick 2023-05-03 10:20:54 +00:00
parent 8f906d4a7d
commit 114332ff2f
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -96,6 +96,7 @@ List<String> jvmRunArgs = [
"--add-opens", "net.synedra.validatorfx/net.synedra.validatorfx=io.xpipe.app",
"--add-opens", 'com.dlsc.preferencesfx/com.dlsc.preferencesfx.view=io.xpipe.app',
"-Xmx8g",
"-Dio.xpipe.app.arch=$rootProject.arch",
"--enable-preview",
// "-XX:+ExitOnOutOfMemoryError",
"-Dfile.encoding=UTF-8",

2
app/src/main/java/io/xpipe/app/core/AppProperties.java
View file

@ -24,6 +24,7 @@ public class AppProperties {
String build;
UUID buildUuid;
String sentryUrl;
String arch;
boolean image;
boolean staging;
Path dataDir;
@ -51,6 +52,7 @@ public class AppProperties {
.map(UUID::fromString)
.orElse(UUID.randomUUID());
sentryUrl = System.getProperty("io.xpipe.app.sentryUrl");
arch = System.getProperty("io.xpipe.app.arch");
dataDir = parseDataDir();
staging = Optional.ofNullable(System.getProperty("io.xpipe.app.staging"))
.map(Boolean::parseBoolean)

3
app/src/main/java/io/xpipe/app/update/AppInstaller.java
View file

@ -3,6 +3,7 @@ package io.xpipe.app.update;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.xpipe.app.core.AppProperties;
import io.xpipe.app.util.ScriptHelper;
import io.xpipe.app.util.TerminalHelper;
import io.xpipe.core.impl.FileNames;
@ -102,7 +103,7 @@ public class AppInstaller {
public abstract void installLocal(String file) throws Exception;
public boolean isCorrectAsset(String name) {
return name.endsWith(getExtension());
return name.endsWith(getExtension()) && name.contains(AppProperties.get().getArch());
}
public abstract String getExtension();