Lexcubia
/
Miao-Yunzai
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!74 修复arm64一直跳过下载chromium 无法安装浏览器 

Merge pull request !74 from 所有二刺螈都得死/master
This commit is contained in:
Kokomi 2023-08-13 18:52:31 +00:00 committed by Gitee
parent 18c6510d34 30e1b1be9a
commit 6637fb5951
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.puppeteerrc.cjs
View File

@ -3,22 +3,20 @@ const { existsSync } = require("fs");
const arch = os.arch(); const arch = os.arch();
let skipDownload = false; let skipDownload = false;
let executablePath; let executablePath;
//win32 存在 Edge 优先选择
// win32 存在 Edge 优先选择
if (process.platform == "win32") { if (process.platform == "win32") {
if ( if (existsSync("C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe")) {
existsSync("C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe")
) {
skipDownload = true; skipDownload = true;
executablePath = executablePath = "C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe";
"C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe";
} }
} else if (process.platform == "linux") { } else if (process.platform == "linux") {
//如果arm64架构跳过下载 // 如果 arm64 架构且存在 Chromium，跳过下载
if (arch == "arm64" || arch == "aarch64") { if ((arch == "arm64" || arch == "aarch64") && existsSync("/usr/bin/chromium")) {
skipDownload = true; skipDownload = true;
} executablePath = "/usr/bin/chromium";
//不管什么架构,如果存在配置则跳过下载,且配置路径 } else if (existsSync("/usr/bin/chromium")) {
if (existsSync("/usr/bin/chromium")) { // 不论什么架构，如果存在 Chromium，跳过下载且配置路径
skipDownload = true; skipDownload = true;
executablePath = "/usr/bin/chromium"; executablePath = "/usr/bin/chromium";
} }
@ -30,4 +28,4 @@ if (process.platform == "win32") {
module.exports = { module.exports = {
skipDownload, skipDownload,
executablePath, executablePath,
}; };