diff --git a/src/common/helper.ts b/src/common/helper.ts index 2412f1cd..11a6222f 100644 --- a/src/common/helper.ts +++ b/src/common/helper.ts @@ -191,8 +191,10 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType { export function getQQPackageInfoPath(exePath: string = '', version: string): string { if (os.platform() === 'darwin') { return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json'); + } else if (os.platform() === 'linux') { + return path.join(path.dirname(exePath), './resources/app/package.json'); } else { - return path.join(path.dirname(exePath), './versions/9.9.15-28060/resources/app/package.json'); + return path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json'); } } diff --git a/src/core/index.ts b/src/core/index.ts index 6f9791eb..0a44c32e 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -45,16 +45,17 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi { let appPath; if (os.platform() === 'darwin') { appPath = path.resolve(path.dirname(process.execPath), '../Resources/app'); + } else if (os.platform() === 'linux') { + appPath = path.resolve(path.dirname(process.execPath), './resources/app'); } else { appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`); } let wrapperNodePath = path.resolve(appPath, 'wrapper.node'); if (!fs.existsSync(wrapperNodePath)) { - wrapperNodePath = path.join(appPath, `./resources/app./wrapper.node`); + wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`); } const nativemodule: any = { exports: {} }; process.dlopen(nativemodule, wrapperNodePath); - //\versions\9.9.15-28060\resources\app\wrapper.node return nativemodule.exports; }