diff --git a/apps/help.js b/apps/help.js index 46f57ed..a273e43 100644 --- a/apps/help.js +++ b/apps/help.js @@ -16,17 +16,13 @@ export class help extends plugin { priority: 500, rule: [ { - reg: '^#*R(插件)?(命令|帮助|菜单|help|说明|功能|指令|使用说明)$', + reg: '^#*(R|r)(插件)?(命令|帮助|菜单|help|说明|功能|指令|使用说明)$', fnc: 'help' } ] }) } - /** - * rule - 闲心插件帮助 - * @returns - */ async help () { let data = await Help.get(this.e) if (!data) return diff --git a/utils/acfun.js b/utils/acfun.js index ab129c5..5be5be6 100644 --- a/utils/acfun.js +++ b/utils/acfun.js @@ -136,11 +136,20 @@ function mergeAcFileToMp4(tsNames, FullFileName, outputFileName, shouldDelete = fs.writeFileSync(ffmpegList, concatStrs.join("\n")); const outPath = path.resolve(outputFileName); + // 执行命令 let cmd = 'ffmpeg'; - const env = { - ...process.env, - PATH: '/usr/local/bin:' + child_process.execSync('echo $PATH').toString(), - }; + // 判断当前环境 + let env; + if (process.platform === "win32") { + env = process.env + } else if (process.platform === "linux") { + env = { + ...process.env, + PATH: '/usr/local/bin:' + child_process.execSync('echo $PATH').toString(), + }; + } else { + console.log("暂时不支持当前操作系统!") + } return new Promise((resolve, reject) => { child_process.exec( diff --git a/utils/bilibili.js b/utils/bilibili.js index e2d388e..bc19a45 100644 --- a/utils/bilibili.js +++ b/utils/bilibili.js @@ -63,10 +63,19 @@ function getDownloadUrl (url) { function mergeFileToMp4 (vFullFileName, aFullFileName, outputFileName, shouldDelete = true) { let cmd = 'ffmpeg'; - const env = { - ...process.env, - PATH: '/usr/local/bin:' + child_process.execSync('echo $PATH').toString(), - }; + + // 判断当前环境 + let env; + if (process.platform === "win32") { + env = process.env + } else if (process.platform === "linux") { + env = { + ...process.env, + PATH: '/usr/local/bin:' + child_process.execSync('echo $PATH').toString(), + }; + } else { + console.log("暂时不支持当前操作系统!") + } return new Promise((resolve, reject) => { child_process.exec(