From 114332ff2f7e10021150316b548d466e51cdaaaa Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 3 May 2023 10:20:54 +0000
Subject: [PATCH] Add arch information

---
 app/build.gradle                                        | 1 +
 app/src/main/java/io/xpipe/app/core/AppProperties.java  | 2 ++
 app/src/main/java/io/xpipe/app/update/AppInstaller.java | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4c21ed22e..b6ceb5f34 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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",
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 4fa914941..0b5708650 100644
--- a/app/src/main/java/io/xpipe/app/core/AppProperties.java
+++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java
@@ -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)
diff --git a/app/src/main/java/io/xpipe/app/update/AppInstaller.java b/app/src/main/java/io/xpipe/app/update/AppInstaller.java
index a4ecd37a5..ba287fa50 100644
--- a/app/src/main/java/io/xpipe/app/update/AppInstaller.java
+++ b/app/src/main/java/io/xpipe/app/update/AppInstaller.java
@@ -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();