[macOS] Fix install progress, install failling and no space error message

electron/gog/games.ts

@@ -44,14 +44,6 @@ const installedGamesStore = new Store({
   name: 'installed'
 })
 
-function verifyProgress(stderr: string): boolean {
-  let index = stderr.lastIndexOf('\n')
-  index = stderr.lastIndexOf('\n', index - 1)
-  const status = stderr.substring(index)
-  const match = status.match(/Progress: ([0-9.]+) ([0-9]+)\/([0-9]+)/)
-  return match !== null && 100 === Number(match[1]) && match[2] === match[3]
-}
-
 class GOGGame extends Game {
   public appName: string
   public window = BrowserWindow.getAllWindows()[0]
@@ -145,7 +137,8 @@ class GOGGame extends Game {
       '--platform',
       installPlatform,
       `--path=${path}`,
-      `--token=${credentials.access_token}`,
+      `--token`,
+      `${credentials.access_token}`,
       withDlcs,
       `--lang=${installLanguage}`,
       workers
@@ -155,6 +148,7 @@ class GOGGame extends Game {
     logInfo([`Installing ${this.appName} with:`, command], LogPrefix.Gog)
 
     const res = await runGogdlCommand(commandParts, logPath)
+    console.log({ res })
 
     if (res.error) {
       logError(
@@ -164,19 +158,6 @@ class GOGGame extends Game {
       return { status: 'error' }
     }
 
-    const success = verifyProgress(res.stderr)
-    if (!success) {
-      logError(
-        [
-          'Failed to install',
-          `${this.appName}:`,
-          'Command aborted unexpectedly'
-        ],
-        LogPrefix.Gog
-      )
-      return { status: 'error' }
-    }
-
     // Installation succeded
     // Save new game info to installed games store
     const installInfo = await this.getInstallInfo()
@@ -283,18 +264,6 @@ class GOGGame extends Game {
       )
     }
 
-    const success = verifyProgress(res.stderr)
-    if (!success) {
-      logError(
-        [
-          'Failed to update',
-          `${this.appName}:`,
-          'Command aborted unexpectedly'
-        ],
-        LogPrefix.Gog
-      )
-    }
-
     return res
   }
 
@@ -412,21 +381,6 @@ class GOGGame extends Game {
       return { status: 'error' }
     }
 
-    const success = verifyProgress(res.stderr)
-    if (!success) {
-      logError(
-        [
-          'Failed to update',
-          `${this.appName}:`,
-          'Command aborted unexpectedly'
-        ],
-        LogPrefix.Gog
-      )
-      return { status: 'error' }
-    }
-
-    // Update was successful
-
     const installedArray = installedGamesStore.get(
       'installed'
     ) as InstalledInfo[]

electron/gog/library.ts

@@ -25,7 +25,7 @@ import {
   logWarning
 } from '../logger/logger'
 import { getGOGdlBin } from '../utils'
-import { fallBackImage, isMac } from '../constants'
+import { fallBackImage, getShell, isMac } from '../constants'
 import { spawn } from 'child_process'
 
 const apiInfoCache = new Store({ cwd: 'gog_store', name: 'api_info_cache' })
@@ -632,7 +632,11 @@ export async function runGogdlCommand(
   }
 
   return new Promise((res, rej) => {
-    const child = spawn(bin, commandParts, { cwd: dir, env: env })
+    const child = spawn(bin, commandParts, {
+      cwd: dir,
+      env: env,
+      shell: getShell()
+    })
 
     const stdout = new Array<string>()
     const stderr = new Array<string>()

electron/legendary/library.ts

@@ -26,6 +26,7 @@ import {
 } from '../utils'
 import {
   fallBackImage,
+  getShell,
   installed,
   legendaryConfigPath,
   libraryPath
@@ -576,7 +577,11 @@ export async function runLegendaryCommand(
   }
 
   return new Promise((res, rej) => {
-    const child = spawn(bin, commandParts, { cwd: dir, env: env })
+    const child = spawn(bin, commandParts, {
+      cwd: dir,
+      env: env,
+      shell: getShell()
+    })
 
     const stdout = new Array<string>()
     const stderr = new Array<string>()

electron/main.ts

@@ -1108,10 +1108,10 @@ ipcMain.handle('updateGame', async (e, game, runner) => {
 })
 
 ipcMain.handle('requestGameProgress', async (event, appName) => {
-  const logPath = join(heroicGamesConfigPath, appName + '.log')
-  // eslint-disable-next-line no-debugger
-  debugger
-  if (!existsSync(logPath)) {
+  const logPath = `"${join(heroicGamesConfigPath, appName + '.log')}"`
+
+  // existsync doesnt work when the path has quotes in it
+  if (!existsSync(logPath.replaceAll('"', ''))) {
     return {}
   }
 
@@ -1138,14 +1138,14 @@ ipcMain.handle('requestGameProgress', async (event, appName) => {
   let eta = ''
   let bytes = ''
   if (isWindows) {
-    percent = progress_result.split(' ')[4]
-    eta = progress_result.split(' ')[10]
+    percent = progress_result.split(' ')[4] || ''
+    eta = progress_result.split(' ')[10] || ''
     bytes = downloaded_result.split(' ')[5] + 'MiB'
   }
 
   if (!isWindows) {
-    percent = progress_result.split(' ')[0]
-    eta = progress_result.split(' ')[1]
+    percent = progress_result.split(' ')[0] || ''
+    eta = progress_result.split(' ')[1] || ''
     bytes = downloaded_result.trim() + 'MiB'
   }
 

electron/utils.ts

@@ -254,7 +254,7 @@ async function errorHandler(
   const noSpaceMsg = 'Not enough available disk space'
   const noCredentialsError = 'No saved credentials'
   if (logPath) {
-    execAsync(`tail ${logPath} | grep 'disk space'`)
+    execAsync(`tail "${logPath}" | grep 'disk space'`)
       .then(({ stdout }) => {
         if (stdout.includes(noSpaceMsg)) {
           logError(noSpaceMsg, LogPrefix.Backend)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "heroic",
-  "version": "2.3.0beta1",
+  "version": "2.3.0-beta-1",
   "private": true,
   "main": "public/main.js",
   "homepage": "./",

src/components/UI/Sidebar/components/SidebarLinks/index.tsx

@@ -90,8 +90,6 @@ export default function SidebarLinks() {
     }
   }, [])
 
-  console.log({ cloudsave: state?.hasCloudSave, appName, type, location })
-
   return (
     <div className="SidebarLinks Sidebar__section">
       <NavLink
@@ -222,6 +220,9 @@ export default function SidebarLinks() {
                 pathname: `/settings/${appName}/wine`,
                 state: { ...state, runner: state?.runner }
               }}
+              className={cx('Sidebar__item SidebarLinks__subItem', {
+                ['active']: category === 'wine'
+              })}
             >
               Wine
             </NavLink>