External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(find-forge-executable): make appName preference effective

Browse Source 
Added fallback variable to track valid candidates that don't match appName. Now returns immediately on exact match, otherwise continues searching and falls back to any valid executable. Applied fix consistently across Windows, Darwin, and Linux branches including .app directories and .AppImage files.
This commit is contained in:
plebeius
2026-01-30 12:57:52 +08:00
parent 815f618320
commit 16012b4239
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/find-forge-executable.js
+25 -10
View File
@@ -35,6 +35,7 @@ const skipDirs = new Set(['node_modules', '.git', 'bin', 'app', 'resources']);
function findExecutable(dir, platform) {
const entries = readdirSync(dir, { withFileTypes: true });
let fallback = null; // Track a valid candidate that doesn't match appName
for (const entry of entries) {
const fullPath = join(dir, entry.name);
@@ -46,21 +47,31 @@ function findExecutable(dir, platform) {
const appPath = fullPath;
const exePath = join(appPath, 'Contents', 'MacOS', entry.name.replace('.app', ''));
if (existsSync(exePath)) {
return exePath;
const lowerAppName = entry.name.toLowerCase();
if (lowerAppName.includes(appName)) {
return exePath; // Exact match, return immediately
}
fallback = fallback || exePath; // Store as fallback, continue searching
}
}
const result = findExecutable(fullPath, platform);
if (result) return result;
if (result) {
const resultName = result.split('/').pop().toLowerCase();
if (resultName.includes(appName)) {
return result; // Exact match from recursion
}
fallback = fallback || result; // Store as fallback
}
} else if (entry.isFile()) {
// Check if it's an executable
if (platform === 'win32') {
const lowerName = entry.name.toLowerCase();
if (lowerName.endsWith('.exe') && !lowerName.includes('electron') && !lowerName.includes('crashpad')) {
if (lowerName.includes(appName)) {
return fullPath;
return fullPath; // Exact match, return immediately
}
return fullPath;
fallback = fallback || fullPath; // Store as fallback, continue searching
}
} else if (platform === 'darwin') {
const stat = statSync(fullPath);
@@ -68,15 +79,19 @@ function findExecutable(dir, platform) {
const lowerName = entry.name.toLowerCase();
if (!lowerName.includes('helper') && !lowerName.includes('crashpad')) {
if (lowerName.includes(appName)) {
return fullPath;
return fullPath; // Exact match, return immediately
}
return fullPath;
fallback = fallback || fullPath; // Store as fallback, continue searching
}
}
} else if (platform === 'linux') {
// Linux executables (AppImage or unpacked)
if (entry.name.endsWith('.AppImage')) {
return fullPath;
const lowerName = entry.name.toLowerCase();
if (lowerName.includes(appName)) {
return fullPath; // Exact match, return immediately
}
fallback = fallback || fullPath; // Store as fallback, continue searching
}
// Check for executable files (not .so libraries)
const stat = statSync(fullPath);
@@ -85,16 +100,16 @@ function findExecutable(dir, platform) {
const lowerName = entry.name.toLowerCase();
if (!lowerName.includes('chrome') && !lowerName.includes('crashpad')) {
if (lowerName.includes(appName)) {
return fullPath;
return fullPath; // Exact match, return immediately
}
return fullPath;
fallback = fallback || fullPath; // Store as fallback, continue searching
}
}
}
}
}
return null;
return fallback; // Return fallback candidate if no exact appName match found
}
let executable = null;