- Added workaround for issue where 7zip-bin doesn't work in linux.

- App now more intelligently looks for 7zip binary on system path for all platforms.

Author: lVlyke

angular.json

@@ -106,5 +106,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

package-lock.json

@@ -3,7 +3,7 @@
   "author": "Mychal Thompson <mychal.r.thompson@gmail.com>",
   "repository": "https://github.com/lVlyke/starfield-mod-loader",
   "license": "GPL-3.0",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "main": "electron.js",
   "scripts": {
     "app:build-dist": "npm run build:release && npm run package",
@@ -48,6 +48,7 @@
     "recursive-readdir": "^2.2.3",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
+    "which": "^4.0.0",
     "zone.js": "~0.13.0"
   },
   "devDependencies": {

package.json

@@ -3,6 +3,11 @@ const { execSync } = require("child_process");
 
 const RELEASE_MODE = process.argv.includes("--release");
 
+execSync(
+    "node ./scripts/fix-7zip-bin-permissions.js",
+    { stdio: "inherit" }
+);
+
 execSync(
     `npx ng build ${RELEASE_MODE ? "--configuration production" : ""}`,
     { stdio: "inherit" }

scripts/build.js

@@ -1,6 +1,7 @@
 //@ts-check
 const fs = require("fs-extra");
 const path = require("path");
+const { execSync } = require("child_process");
 
 const BUILD_DIR = "./dist";
 
@@ -26,9 +27,16 @@ const DEPENDENCIES = [
     "minimatch",
     "brace-expansion",
     "balanced-match",
-    "concat-map"
+    "concat-map",
+    "which",
+    "isexe"
 ];
 
+execSync(
+    "node ./scripts/fix-7zip-bin-permissions.js",
+    { stdio: "inherit" }
+);
+
 fs.mkdirSync(BUILD_DIR, { recursive: true })
 
 DEPENDENCIES.forEach((dep) => {

scripts/copy-electron-deps.js

@@ -0,0 +1,17 @@
+// @ts-check
+const { execSync } = require("child_process");
+const sevenBin = require("7zip-bin");
+
+// Workaround for 7zip-bin issue: https://github.com/develar/7zip-bin/issues/19
+// TODO - Remove when this issue is fixed
+if (process.platform !== "win32") {
+    execSync(
+        `chmod +x ${sevenBin.path7za}`,
+        { stdio: "inherit" }
+    );
+
+    execSync(
+        `chmod +x ${sevenBin.path7x}`,
+        { stdio: "inherit" }
+    );
+}

scripts/fix-7zip-bin-permissions.js

@@ -6,6 +6,11 @@ const spawn = require("child_process").spawn;
 const BUILD_DIR = "./dist";
 const RELEASE_MODE = process.argv.includes("--release");
 
+execSync(
+    "node ./scripts/fix-7zip-bin-permissions.js",
+    { stdio: "inherit" }
+);
+
 const buildTask = spawn("npx", [
     "ng",
     "build",

scripts/serve.js

@@ -11,6 +11,7 @@ const fsPromises = require("fs").promises;
 const _ = require("lodash");
 const Seven = require("node-7z");
 const sevenBin = require("7zip-bin");
+const which = require("which");
 
 // TODO - Replace this with fs.readdir(..., { recursive: true }) when electron uses Node v18.17.0+
 const recursiveReaddir = require("recursive-readdir");
@@ -224,17 +225,36 @@ class ElectronLoader {
                     case ".rar": {
                         decompressOperation = new Promise((resolve, _reject) => {
                             // Look for 7-Zip installed on system
+                            const _7zBinaries = [
+                                "7zzs",
+                                "7zz",
+                                "7z.exe"
+                            ];
+
                             const _7zBinaryLocations = [
-                                "7z",
-                                "7z.exe",
                                 "C:\\Program Files\\7-Zip\\7z.exe",
                                 "C:\\Program Files (x86)\\7-Zip\\7z.exe"
                             ];
-                            const decompressStream = Seven.extractFull(filePath, modDirStagingPath, {
-                                // Fall back to bundled 7-Zip binary if not found on system
+
+                            let _7zBinaryPath = _7zBinaryLocations.find(_7zPath => fs.existsSync(_7zPath));
+                            
+                            if (!_7zBinaryPath) {
+                                _7zBinaryPath = _7zBinaries.reduce((_7zBinaryPath, _7zBinaryPathGuess) => {
+                                    try {
+                                        _7zBinaryPath = which.sync(_7zBinaryPathGuess);
+                                    } catch (_err) {}
+
+                                    return _7zBinaryPath;
+                                }, _7zBinaryPath);
+                            }
+
+                            if (!_7zBinaryPath) {
+                                // Fall back to bundled 7-Zip binary if it's not found on system
                                 // TODO - Warn user about opening RARs if 7-Zip not installed on machine
-                                $bin: _7zBinaryLocations.find(_7zPath => fs.existsSync(_7zPath)) ?? sevenBin.path7za
-                            });
+                                _7zBinaryPath = sevenBin.path7za;
+                            }
+
+                            const decompressStream = Seven.extractFull(filePath, modDirStagingPath, { $bin: _7zBinaryPath });
 
                             decompressStream.on("data", ({ file }) => {
                                 modFilePaths.push(file);