Merge remote-tracking branch 'origin/master'

ebkr · Feb 23, 2021 · 0e20282 · 0e20282
2 parents 8f598c6 + a79cc30
commit 0e20282
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/modExclusions.md b/modExclusions.md
@@ -1,5 +1,7 @@
 ebkr-r2modman
 
+ebkr-r2modman_dsp
+
 Harb-AttributeFinder
 
 ethanbrews-RiskOfRainModManager

diff --git a/src/r2mm/installing/ProfileInstaller.ts b/src/r2mm/installing/ProfileInstaller.ts
@@ -53,11 +53,6 @@ export default class ProfileInstaller extends ProfileInstallerProvider {
                         if (file.toLowerCase() !== 'mods.yml') {
                             await fs.unlink(filePath);
                         }
-                    } else {
-                        if ((await fs.lstat(filePath)).isDirectory()) {
-                            await FileUtils.emptyDirectory(filePath);
-                            await fs.rmdir(filePath);
-                        }
                     }
                 }
             } catch(e) {

diff --git a/src/r2mm/manager/linux/GameDirectoryResolver.ts b/src/r2mm/manager/linux/GameDirectoryResolver.ts
@@ -6,7 +6,7 @@ import * as vdf from '@node-steam/vdf';
 import * as path from 'path';
 import { homedir } from 'os';
 import ManagerSettings from '../ManagerSettings';
-import FsProvider from "../../../providers/generic/file/FsProvider";
+import FsProvider from '../../../providers/generic/file/FsProvider';
 import GameDirectoryResolverProvider from '../../../providers/ror2/game/GameDirectoryResolverProvider';
 import Game from '../../../model/game/Game';
 import GameManager from '../../../model/game/GameManager';
@@ -21,11 +21,17 @@ export default class GameDirectoryResolverImpl extends GameDirectoryResolverProv
         try {
             const dirs = [
                 path.resolve(homedir(), '.local', 'share', 'Steam'),
-                path.resolve(homedir(), '.var', 'app', 'com.valvesoftware.Steam', '.local', 'share', 'Steam')
+                path.resolve(homedir(), '.steam', 'steam'),
+                path.resolve(homedir(), '.steam', 'root'),
+                path.resolve(homedir(), '.steam'),
+                path.resolve(homedir(), '.var', 'app', 'com.valvesoftware.Steam', '.local', 'share', 'Steam'),
+                path.resolve(homedir(), '.var', 'app', 'com.valvesoftware.Steam', '.steam', 'steam'),
+                path.resolve(homedir(), '.var', 'app', 'com.valvesoftware.Steam', '.steam', 'root'),
+                path.resolve(homedir(), '.var', 'app', 'com.valvesoftware.Steam', '.steam')
             ];
             for (let dir of dirs) {
                 if (await FsProvider.instance.exists(dir))
-                    return dir;
+                    return await FsProvider.instance.realpath(dir);
             }
             throw new Error('Steam is not installed');
         } catch(e) {