lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Update Linux packaging experience

Browse Source
This commit is contained in:
Tw93
2024-12-30 15:36:25 +08:00
parent 1032b09ebd
commit 4871e0dafc
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/README.md vendored
View File

@@ -178,7 +178,7 @@ Package the application to support both Intel and M1 chips, exclusively for macO
#### [targets] #### [targets]
Select the output package format for Linux. Options include `deb`, `appimage`, or `all`. If `all` is selected, both `deb` and `appimage` will be packaged. Default is `all`. Select the output package format for Linux. Options include `deb`, `appimage`, or `all`. If `all` is selected, both `deb` and `appimage` will be packaged. Default is `deb`.
```shell ```shell
--targets <format> --targets <format>

3
bin/README_CN.md vendored
View File

@@ -178,8 +178,7 @@ pake [url] [options]
#### [targets] #### [targets]
选择输出的包格式，支持 `deb`、`appimage` 或 `all`。如果选择 `all`，则会同时打包 `deb` 和 `appimage`。此选项仅适用于 选择输出的包格式，支持 `deb`、`appimage` 或 `all`，如果选择 `all`，则会同时打包 `deb` 和 `appimage`，此选项仅适用于 Linux，默认为 `deb`。
Linux，默认为 `all`。
```shell ```shell
--targets <string> --targets <string>

2
bin/builders/BaseBuilder.ts vendored
View File

@@ -28,7 +28,7 @@ export default abstract class BaseBuilder {
if (!IS_MAC && !tauriTargetPathExists) { if (!IS_MAC && !tauriTargetPathExists) {
logger.warn('✼ The first use requires installing system dependencies.'); logger.warn('✼ The first use requires installing system dependencies.');
logger.warn('✼ See more in https://tauri.app/guides/getting-started/prerequisites.'); logger.warn('✼ See more in https://tauri.app/start/prerequisites/.');
} }
if (!checkRustInstalled()) { if (!checkRustInstalled()) {

2
bin/utils/shell.ts vendored
View File

@@ -7,7 +7,7 @@ export function shellExec(command: string) {
if (code === 0) { if (code === 0) {
resolve(0); resolve(0);
} else { } else {
reject(new Error(`${code}`)); reject(new Error(`Error occurred while executing command "${command}". Exit code: ${code}`));
} }
}); });
}); });

4
dist/cli.js vendored
View File

@@ -265,7 +265,6 @@ let tauriConfig = {
app: { app: {
...CommonConf.app, ...CommonConf.app,
trayIcon: { trayIcon: {
...CommonConf.app.trayIcon,
...(platformConfig?.app?.trayIcon ?? {}), ...(platformConfig?.app?.trayIcon ?? {}),
}, },
}, },
@@ -320,7 +319,7 @@ function shellExec(command) {
resolve(0); resolve(0);
} }
else { else {
reject(new Error(`${code}`)); reject(new Error(`Error occurred while executing command "${command}". Exit code: ${code}`));
} }
}); });
}); });
@@ -443,7 +442,6 @@ async function mergeConfig(url, options, tauriConf) {
Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions }); Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
tauriConf.productName = name; tauriConf.productName = name;
tauriConf.identifier = identifier; tauriConf.identifier = identifier;
console.log('tauriConf appVersion>>>>>>>>>>>>>>>>>>>>>>>', appVersion);
tauriConf.version = appVersion; tauriConf.version = appVersion;
if (platform == 'win32') { if (platform == 'win32') {
tauriConf.bundle.windows.wix.language[0] = installerLanguage; tauriConf.bundle.windows.wix.language[0] = installerLanguage;