chore: better checks

Author: flavioislima

src/backend/utils.ts

@@ -45,7 +45,8 @@ import {
   isWindows,
   publicDir,
   isMac,
-  configStore
+  configStore,
+  isIntelMac
 } from './constants'
 import {
   logChangedSetting,
@@ -743,15 +744,7 @@ export const spawnAsync = async (
 }
 
 export async function checkRosettaInstall() {
-  if (!isMac) {
-    return
-  }
-
-  // check if on arm64 macOS
-  const { stdout: archCheck } = await execAsync('arch')
-  const isArm64 = archCheck.trim() === 'arm64'
-
-  if (!isArm64) {
+  if (isIntelMac) {
     return
   }
 

src/backend/utils/compatibility_layers.ts

@@ -598,7 +598,7 @@ export async function initializeCompatibilityLayer() {
     initializationTasks.push(downloadDefaultWine())
   }
 
-  if (isMac || isLinux) {
+  if (!isWindows) {
     if (isMac) {
       initializationTasks.push(checkRosettaInstall())
     }
@@ -626,7 +626,6 @@ export async function downloadDefaultWine() {
 
     // use Proton-GE type if on Linux and GPTK or Wine-Crossover if on Mac
     const isMacOSUpToDate = await isMacSonomaOrHigher()
-    const isGPTKCompatible = isMac ? isMacOSUpToDate && !isIntelMac : false
 
     const results = await Promise.all(
       availableWine.map(async (version) => {
@@ -635,9 +634,10 @@ export async function downloadDefaultWine() {
         }
 
         if (isMac) {
-          return isGPTKCompatible
-            ? version.type === 'Game-Porting-Toolkit'
-            : version.type === 'Wine-Crossover'
+          if (isMacOSUpToDate && !isIntelMac) {
+            return version.type === 'Game-Porting-Toolkit'
+          }
+          return version.type === 'Wine-Crossover'
         }
         return false
       })