diff --git a/bin/README.md b/bin/README.md index dc8ed9a..3b7f28a 100644 --- a/bin/README.md +++ b/bin/README.md @@ -178,7 +178,7 @@ Package the application to support both Intel and M1 chips, exclusively for macO #### [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 --targets diff --git a/bin/README_CN.md b/bin/README_CN.md index ce7eb30..0560639 100644 --- a/bin/README_CN.md +++ b/bin/README_CN.md @@ -178,8 +178,7 @@ pake [url] [options] #### [targets] -选择输出的包格式,支持 `deb`、`appimage` 或 `all`。如果选择 `all`,则会同时打包 `deb` 和 `appimage`。此选项仅适用于 -Linux,默认为 `all`。 +选择输出的包格式,支持 `deb`、`appimage` 或 `all`,如果选择 `all`,则会同时打包 `deb` 和 `appimage`,此选项仅适用于 Linux,默认为 `deb`。 ```shell --targets diff --git a/bin/builders/BaseBuilder.ts b/bin/builders/BaseBuilder.ts index 6f06c13..f318e36 100644 --- a/bin/builders/BaseBuilder.ts +++ b/bin/builders/BaseBuilder.ts @@ -28,7 +28,7 @@ export default abstract class BaseBuilder { if (!IS_MAC && !tauriTargetPathExists) { 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()) { diff --git a/bin/utils/shell.ts b/bin/utils/shell.ts index 5463075..d750e82 100644 --- a/bin/utils/shell.ts +++ b/bin/utils/shell.ts @@ -7,7 +7,7 @@ export function shellExec(command: string) { if (code === 0) { resolve(0); } else { - reject(new Error(`${code}`)); + reject(new Error(`Error occurred while executing command "${command}". Exit code: ${code}`)); } }); }); diff --git a/dist/cli.js b/dist/cli.js index b7db743..d192c6e 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -265,7 +265,6 @@ let tauriConfig = { app: { ...CommonConf.app, trayIcon: { - ...CommonConf.app.trayIcon, ...(platformConfig?.app?.trayIcon ?? {}), }, }, @@ -320,7 +319,7 @@ function shellExec(command) { resolve(0); } 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 }); tauriConf.productName = name; tauriConf.identifier = identifier; - console.log('tauriConf appVersion>>>>>>>>>>>>>>>>>>>>>>>', appVersion); tauriConf.version = appVersion; if (platform == 'win32') { tauriConf.bundle.windows.wix.language[0] = installerLanguage;