Merge branch 'master' of https://github.com/Zagrios/bs-manager

src/main/services/additional-content/maps/local-maps-manager.service.ts

@@ -369,10 +369,12 @@ export class LocalMapsManagerService {
                     for (const folder of mapsFolders) {
                         log.info(">", folder);
 
-                        const regex = new RegExp(`^${escapeRegExp(folder)}\\/`);
+                        const entriesNames = isRoot
+                            ? null
+                            : [ new RegExp(`^${escapeRegExp(folder)}\\/`) ];
 
                         const exported = await zip.extract(destination, {
-                            entriesNames: [regex],
+                            entriesNames,
                             abortToken: abortController
                         });
 

src/main/services/linux.service.ts

@@ -129,7 +129,12 @@ export class LinuxService {
         return fs.pathExistsSync(protonPath) && fs.pathExistsSync(winePath);
     }
 
-    public getWinePath(): string {
+    public async getWinePath(): Promise<string> {
+        if (await this.isNixOS()) {
+            // Use system wine for nixos
+            return "wine";
+        }
+
         if (!this.staticConfig.has("proton-folder")) {
             throw new Error("proton-folder variable not set");
         }

src/main/services/mods/bs-mods-manager.service.ts

@@ -150,7 +150,7 @@ export class BsModsManagerService {
         let winePath: string = "";
         if (process.platform === "linux") {
             const { error: winePathError, result: winePathResult } =
-                tryit(() => this.linuxService.getWinePath());
+                await tryit(async () => this.linuxService.getWinePath());
             if (winePathError) {
                 log.error(winePathError);
                 return false;