pake-cli 3.1.1 → 3.2.0-beta1

package/dist/cli.js

@@ -4,7 +4,7 @@ import log from 'loglevel';
 import path from 'path';
 import fsExtra from 'fs-extra';
 import prompts from 'prompts';
-import shelljs from 'shelljs';
+import { execa, execaSync } from 'execa';
 import crypto from 'crypto';
 import ora from 'ora';
 import { fileURLToPath } from 'url';
@@ -17,10 +17,9 @@ import axios from 'axios';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import * as psl from 'psl';
-import isUrl from 'is-url';
 
 var name = "pake-cli";
-var version$1 = "3.1.1";
+var version$1 = "3.2.0-beta1";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -61,49 +60,47 @@ var scripts = {
 	cli: "rollup -c rollup.config.js --watch",
 	"cli:dev": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
 	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
+	format: "npx prettier --write . --ignore-unknown && cd src-tauri && cargo fmt --verbose",
 	prepublishOnly: "npm run cli:build"
 };
 var type = "module";
 var exports = "./dist/pake.js";
 var license = "MIT";
 var dependencies = {
-	"@tauri-apps/api": "^1.6.0",
-	"@tauri-apps/cli": "^2.1.0",
-	axios: "^1.7.9",
-	chalk: "^5.4.1",
+	"@tauri-apps/api": "^2.7.0",
+	"@tauri-apps/cli": "^2.7.1",
+	axios: "^1.11.0",
+	chalk: "^5.5.0",
 	commander: "^11.1.0",
+	execa: "^9.6.0",
 	"file-type": "^18.7.0",
-	"fs-extra": "^11.2.0",
-	"is-url": "^1.2.4",
+	"fs-extra": "^11.3.1",
 	loglevel: "^1.9.2",
-	ora: "^7.0.1",
+	ora: "^8.2.0",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
-	shelljs: "^0.8.5",
 	"tmp-promise": "^3.0.3",
 	"update-notifier": "^7.3.1"
 };
 var devDependencies = {
 	"@rollup/plugin-alias": "^5.1.1",
-	"@rollup/plugin-commonjs": "^25.0.8",
+	"@rollup/plugin-commonjs": "^28.0.6",
 	"@rollup/plugin-json": "^6.1.0",
-	"@rollup/plugin-replace": "^5.0.7",
+	"@rollup/plugin-replace": "^6.0.2",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
-	"@types/is-url": "^1.2.32",
-	"@types/node": "^20.17.10",
+	"@types/node": "^20.19.10",
 	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
-	"@types/psl": "^1.1.3",
-	"@types/shelljs": "^0.8.15",
+	"@types/psl": "^1.11.0",
 	"@types/tmp": "^0.2.6",
 	"@types/update-notifier": "^6.0.8",
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
-	rollup: "^4.29.1",
+	rollup: "^4.46.2",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
-	typescript: "^5.7.2"
+	typescript: "^5.9.2"
 };
 var packageJson = {
 	name: name,
@@ -125,7 +122,7 @@ var packageJson = {
 
 var windows = [
 	{
-		url: "https://weread.qq.com",
+		url: "https://weekly.tw93.fun/",
 		url_type: "web",
 		hide_title_bar: true,
 		fullscreen: false,
@@ -135,7 +132,8 @@ var windows = [
 		always_on_top: false,
 		dark_mode: false,
 		activation_shortcut: "",
-		disabled_web_shortcuts: false
+		disabled_web_shortcuts: false,
+		hide_on_close: true
 	}
 ];
 var user_agent = {
@@ -161,13 +159,13 @@ var pakeConf = {
 	proxy_url: proxy_url
 };
 
-var productName$1 = "WeRead";
-var identifier = "com.pake.weread";
+var productName$1 = "Weekly";
+var identifier = "com.pake.weekly";
 var version = "1.0.0";
 var app = {
 	withGlobalTauri: true,
 	trayIcon: {
-		iconPath: "png/weread_512.png",
+		iconPath: "png/weekly_512.png",
 		iconAsTemplate: false,
 		id: "pake-tray"
 	}
@@ -185,12 +183,12 @@ var CommonConf = {
 
 var bundle$2 = {
 	icon: [
-		"png/weread_256.ico",
-		"png/weread_32.ico"
+		"png/weekly_256.ico",
+		"png/weekly_32.ico"
 	],
 	active: true,
 	resources: [
-		"png/weread_32.ico"
+		"png/weekly_32.ico"
 	],
 	targets: [
 		"msi"
@@ -211,7 +209,7 @@ var WinConf = {
 
 var bundle$1 = {
 	icon: [
-		"icons/weread.icns"
+		"icons/weekly.icns"
 	],
 	active: true,
 	macOS: {
@@ -227,7 +225,7 @@ var MacConf = {
 var productName = "we-read";
 var bundle = {
 	icon: [
-		"png/weread_512.png"
+		"png/weekly.png"
 	],
 	active: true,
 	linux: {
@@ -237,7 +235,7 @@ var bundle = {
 				"wget"
 			],
 			files: {
-				"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
+				"/usr/share/applications/com-pake-weekly.desktop": "assets/com-pake-weekly.desktop"
 			}
 		}
 	},
@@ -274,7 +272,11 @@ let tauriConfig = {
 
 // Generates an identifier based on the given URL.
 function getIdentifier(url) {
-    const postFixHash = crypto.createHash('md5').update(url).digest('hex').substring(0, 6);
+    const postFixHash = crypto
+        .createHash('md5')
+        .update(url)
+        .digest('hex')
+        .substring(0, 6);
     return `com.pake.${postFixHash}`;
 }
 async function promptText(message, initial) {
@@ -312,34 +314,37 @@ const currentModulePath = fileURLToPath(import.meta.url);
 const npmDirectory = path.join(path.dirname(currentModulePath), '..');
 const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri');
 
-function shellExec(command) {
-    return new Promise((resolve, reject) => {
-        shelljs.exec(command, { async: true, silent: false, cwd: npmDirectory }, code => {
-            if (code === 0) {
-                resolve(0);
-            }
-            else {
-                reject(new Error(`Error occurred while executing command "${command}". Exit code: ${code}`));
-            }
+async function shellExec(command) {
+    try {
+        const { exitCode } = await execa(command, {
+            cwd: npmDirectory,
+            stdio: 'inherit',
+            shell: true,
         });
-    });
+        return exitCode;
+    }
+    catch (error) {
+        const exitCode = error.exitCode ?? 'unknown';
+        const errorMessage = error.message || 'Unknown error occurred';
+        throw new Error(`Error occurred while executing command "${command}". Exit code: ${exitCode}. Details: ${errorMessage}`);
+    }
 }
 
 const logger = {
     info(...msg) {
-        log.info(...msg.map(m => chalk.white(m)));
+        log.info(...msg.map((m) => chalk.white(m)));
     },
     debug(...msg) {
         log.debug(...msg);
     },
     error(...msg) {
-        log.error(...msg.map(m => chalk.red(m)));
+        log.error(...msg.map((m) => chalk.red(m)));
     },
     warn(...msg) {
-        log.info(...msg.map(m => chalk.yellow(m)));
+        log.info(...msg.map((m) => chalk.yellow(m)));
     },
     success(...msg) {
-        log.info(...msg.map(m => chalk.green(m)));
+        log.info(...msg.map((m) => chalk.green(m)));
     },
 };
 
@@ -350,12 +355,12 @@ const ping = async (host) => {
     const start = new Date();
     // Prevent timeouts from affecting user experience.
     const requestPromise = new Promise((resolve, reject) => {
-        const req = http.get(`http://${ip.address}`, res => {
+        const req = http.get(`http://${ip.address}`, (res) => {
             const delay = new Date().getTime() - start.getTime();
             res.resume();
             resolve(delay);
         });
-        req.on('error', err => {
+        req.on('error', (err) => {
             reject(err);
         });
     });
@@ -407,25 +412,33 @@ async function installRust() {
     }
 }
 function checkRustInstalled() {
-    return shelljs.exec('rustc --version', { silent: true }).code === 0;
+    try {
+        execaSync('rustc', ['--version']);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 
 async function combineFiles(files, output) {
-    const contents = files.map(file => {
+    const contents = files.map((file) => {
         const fileContent = fs.readFileSync(file);
         if (file.endsWith('.css')) {
             return ("window.addEventListener('DOMContentLoaded', (_event) => { const css = `" +
                 fileContent +
                 "`; const style = document.createElement('style'); style.innerHTML = css; document.head.appendChild(style); });");
         }
-        return "window.addEventListener('DOMContentLoaded', (_event) => { " + fileContent + ' });';
+        return ("window.addEventListener('DOMContentLoaded', (_event) => { " +
+            fileContent +
+            ' });');
     });
     fs.writeFileSync(output, contents.join('\n'));
     return files;
 }
 
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, } = options;
+    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
@@ -438,6 +451,7 @@ async function mergeConfig(url, options, tauriConf) {
         always_on_top: alwaysOnTop,
         dark_mode: darkMode,
         disabled_web_shortcuts: disabledWebShortcuts,
+        hide_on_close: hideOnClose,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
@@ -465,7 +479,7 @@ async function mergeConfig(url, options, tauriConf) {
             // ignore it, because about_pake.html have be erased.
             // const filesToCopyBack = ['cli.js', 'about_pake.html'];
             const filesToCopyBack = ['cli.js'];
-            await Promise.all(filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))));
+            await Promise.all(filesToCopyBack.map((file) => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))));
         }
         tauriConf.pake.windows[0].url = fileName;
         tauriConf.pake.windows[0].url_type = 'local';
@@ -569,11 +583,11 @@ async function mergeConfig(url, options, tauriConf) {
     const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`);
     // inject js or css files
     if (inject?.length > 0) {
-        if (!inject.every(item => item.endsWith('.css') || item.endsWith('.js'))) {
+        if (!inject.every((item) => item.endsWith('.css') || item.endsWith('.js'))) {
             logger.error('The injected file must be in either CSS or JS format.');
             return;
         }
-        const files = inject.map(filepath => (path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)));
+        const files = inject.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
         tauriConf.pake.inject = files;
         await combineFiles(files, injectFilePath);
     }
@@ -701,7 +715,9 @@ class MacBuilder extends BaseBuilder {
         return `${name}_${tauriConfig.version}_${arch}`;
     }
     getBuildCommand() {
-        return this.options.multiArch ? 'npm run build:mac' : super.getBuildCommand();
+        return this.options.multiArch
+            ? 'npm run build:mac'
+            : super.getBuildCommand();
     }
     getBasePath() {
         return this.options.multiArch
@@ -778,7 +794,6 @@ const DEFAULT_PAKE_OPTIONS = {
     height: 780,
     width: 1200,
     fullscreen: false,
-    resizable: true,
     hideTitleBar: false,
     alwaysOnTop: false,
     appVersion: '1.0.0',
@@ -791,14 +806,17 @@ const DEFAULT_PAKE_OPTIONS = {
     targets: 'deb',
     useLocalFile: false,
     systemTrayIcon: '',
-    proxyUrl: "",
+    proxyUrl: '',
     debug: false,
     inject: [],
     installerLanguage: 'en-US',
+    hideOnClose: true,
 };
 
 async function checkUpdateTips() {
-    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({ isGlobal: true });
+    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({
+        isGlobal: true,
+    });
 }
 
 async function handleIcon(options) {
@@ -823,7 +841,9 @@ async function handleIcon(options) {
 async function downloadIcon(iconUrl) {
     const spinner = getSpinner('Downloading icon...');
     try {
-        const iconResponse = await axios.get(iconUrl, { responseType: 'arraybuffer' });
+        const iconResponse = await axios.get(iconUrl, {
+            responseType: 'arraybuffer',
+        });
         const iconData = await iconResponse.data;
         if (!iconData) {
             return null;
@@ -886,11 +906,12 @@ function appendProtocol(inputUrl) {
 // Normalizes the URL by ensuring it has a protocol and is valid.
 function normalizeUrl(urlToNormalize) {
     const urlWithProtocol = appendProtocol(urlToNormalize);
-    if (isUrl(urlWithProtocol)) {
+    try {
+        new URL(urlWithProtocol);
         return urlWithProtocol;
     }
-    else {
-        throw new Error(`Your url "${urlWithProtocol}" is invalid`);
+    catch (err) {
+        throw new Error(`Your url "${urlWithProtocol}" is invalid: ${err.message}`);
     }
 }
 
@@ -900,8 +921,8 @@ function resolveAppName(name, platform) {
 }
 function isValidName(name, platform) {
     const platformRegexMapping = {
-        linux: /^[a-z0-9]+(-[a-z0-9]+)*$/,
-        default: /^[a-zA-Z0-9]+([-a-zA-Z0-9])*$/,
+        linux: /^[a-z0-9][a-z0-9-]*$/,
+        default: /^[a-zA-Z0-9][a-zA-Z0-9- ]*$/,
     };
     const reg = platformRegexMapping[platform] || platformRegexMapping.default;
     return !!name && reg.test(name);
@@ -917,9 +938,14 @@ async function handleOptions(options, url) {
         const namePrompt = await promptText(promptMessage, defaultName);
         name = namePrompt || defaultName;
     }
+    // Handle platform-specific name formatting
+    if (name && platform === 'linux') {
+        // Convert to lowercase and replace spaces with dashes for Linux
+        name = name.toLowerCase().replace(/\s+/g, '-');
+    }
     if (!isValidName(name, platform)) {
-        const LINUX_NAME_ERROR = `✕ name should only include lowercase letters, numbers, and dashes, and must contain at least one lowercase letter. Examples: com-123-xxx, 123pan, pan123, weread, we-read.`;
-        const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and dashes (dashes must not at the beginning), and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read.`;
+        const LINUX_NAME_ERROR = `✕ Name should only include lowercase letters, numbers, and dashes (not leading dashes). Examples: com-123-xxx, 123pan, pan123, weread, we-read, 123.`;
+        const DEFAULT_NAME_ERROR = `✕ Name should only include letters, numbers, dashes, and spaces (not leading dashes and spaces). Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read, We Read, 123.`;
         const errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR;
         logger.error(errorMsg);
         if (isActions) {
@@ -966,9 +992,15 @@ ${green('| |_) / _` | |/ / _ \\')}
 ${green('|  __/ (_| |   <  __/')}  ${yellow('https://github.com/tw93/pake')}
 ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with Rust.')}
 `;
-program.addHelpText('beforeAll', logo).usage(`[url] [options]`).showHelpAfterError();
+program
+    .addHelpText('beforeAll', logo)
+    .usage(`[url] [options]`)
+    .showHelpAfterError();
 program
     .argument('[url]', 'The web URL you want to package', validateUrlInput)
+    // Refer to https://github.com/tj/commander.js#custom-option-processing, turn string array into a string connected with custom connectors.
+    // If the platform is Linux, use `-` as the connector, and convert all characters to lowercase.
+    // For example, Google Translate will become google-translate.
     .option('--name <string>', 'Application name')
     .option('--icon <string>', 'Application icon', DEFAULT_PAKE_OPTIONS.icon)
     .option('--width <number>', 'Window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
@@ -977,27 +1009,62 @@ program
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
     .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
     .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
-    .option('--inject <url>', 'Injection of .js or .css files', DEFAULT_PAKE_OPTIONS.inject)
+    .option('--inject <./style.css,./script.js,...>', 'Injection of .js or .css files', (val, previous) => {
+    if (!val)
+        return DEFAULT_PAKE_OPTIONS.inject;
+    // Split by comma and trim whitespace, filter out empty strings
+    const files = val
+        .split(',')
+        .map((item) => item.trim())
+        .filter((item) => item.length > 0);
+    // If previous values exist (from multiple --inject options), merge them
+    return previous ? [...previous, ...files] : files;
+}, DEFAULT_PAKE_OPTIONS.inject)
     .option('--debug', 'Debug build and more output', DEFAULT_PAKE_OPTIONS.debug)
-    .addOption(new Option('--proxy-url <url>', 'Proxy URL for all network requests').default(DEFAULT_PAKE_OPTIONS.proxyUrl).hideHelp())
-    .addOption(new Option('--user-agent <string>', 'Custom user agent').default(DEFAULT_PAKE_OPTIONS.userAgent).hideHelp())
-    .addOption(new Option('--targets <string>', 'For Linux, option "deb" or "appimage"').default(DEFAULT_PAKE_OPTIONS.targets).hideHelp())
-    .addOption(new Option('--app-version <string>', 'App version, the same as package.json version').default(DEFAULT_PAKE_OPTIONS.appVersion).hideHelp())
-    .addOption(new Option('--always-on-top', 'Always on the top level').default(DEFAULT_PAKE_OPTIONS.alwaysOnTop).hideHelp())
-    .addOption(new Option('--dark-mode', 'Force Mac app to use dark mode').default(DEFAULT_PAKE_OPTIONS.darkMode).hideHelp())
-    .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts').default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts).hideHelp())
-    .addOption(new Option('--activation-shortcut <string>', 'Shortcut key to active App').default(DEFAULT_PAKE_OPTIONS.activationShortcut).hideHelp())
-    .addOption(new Option('--show-system-tray', 'Show system tray in app').default(DEFAULT_PAKE_OPTIONS.showSystemTray).hideHelp())
-    .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon').default(DEFAULT_PAKE_OPTIONS.systemTrayIcon).hideHelp())
-    .addOption(new Option('--installer-language <string>', 'Installer language').default(DEFAULT_PAKE_OPTIONS.installerLanguage).hideHelp())
+    .addOption(new Option('--proxy-url <url>', 'Proxy URL for all network requests (http://, https://, socks5://)')
+    .default(DEFAULT_PAKE_OPTIONS.proxyUrl)
+    .hideHelp())
+    .addOption(new Option('--user-agent <string>', 'Custom user agent')
+    .default(DEFAULT_PAKE_OPTIONS.userAgent)
+    .hideHelp())
+    .addOption(new Option('--targets <string>', 'For Linux, option "deb" or "appimage"')
+    .default(DEFAULT_PAKE_OPTIONS.targets)
+    .hideHelp())
+    .addOption(new Option('--app-version <string>', 'App version, the same as package.json version')
+    .default(DEFAULT_PAKE_OPTIONS.appVersion)
+    .hideHelp())
+    .addOption(new Option('--always-on-top', 'Always on the top level')
+    .default(DEFAULT_PAKE_OPTIONS.alwaysOnTop)
+    .hideHelp())
+    .addOption(new Option('--dark-mode', 'Force Mac app to use dark mode')
+    .default(DEFAULT_PAKE_OPTIONS.darkMode)
+    .hideHelp())
+    .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts')
+    .default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts)
+    .hideHelp())
+    .addOption(new Option('--activation-shortcut <string>', 'Shortcut key to active App')
+    .default(DEFAULT_PAKE_OPTIONS.activationShortcut)
+    .hideHelp())
+    .addOption(new Option('--show-system-tray', 'Show system tray in app')
+    .default(DEFAULT_PAKE_OPTIONS.showSystemTray)
+    .hideHelp())
+    .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon')
+    .default(DEFAULT_PAKE_OPTIONS.systemTrayIcon)
+    .hideHelp())
+    .addOption(new Option('--hide-on-close', 'Hide window on close instead of exiting')
+    .default(DEFAULT_PAKE_OPTIONS.hideOnClose)
+    .hideHelp())
+    .addOption(new Option('--installer-language <string>', 'Installer language')
+    .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
+    .hideHelp())
     .version(packageJson.version, '-v, --version', 'Output the current version')
     .action(async (url, options) => {
     await checkUpdateTips();
     if (!url) {
-        program.outputHelp(str => {
+        program.outputHelp((str) => {
             return str
                 .split('\n')
-                .filter(line => !/((-h,|--help)|((-v|-V),|--version))\s+.+$/.test(line))
+                .filter((line) => !/((-h,|--help)|((-v|-V),|--version))\s+.+$/.test(line))
                 .join('\n');
         });
         process.exit(0);

package/dist/dev.js

@@ -11,7 +11,7 @@ import ora from 'ora';
 import { fileTypeFromBuffer } from 'file-type';
 import * as psl from 'psl';
 import 'is-url';
-import shelljs from 'shelljs';
+import { execa, execaSync } from 'execa';
 import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
@@ -70,7 +70,8 @@ const logger = {
 const currentModulePath = fileURLToPath(import.meta.url);
 // Resolve the parent directory of the current module
 const npmDirectory = path.join(path.dirname(currentModulePath), '..');
-const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri');
+const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri', '.pake')
+    ;
 
 const { platform: platform$2 } = process;
 const IS_MAC = platform$2 === 'darwin';
@@ -373,17 +374,17 @@ let tauriConfig = {
     pake: pakeConf,
 };
 
-function shellExec(command) {
-    return new Promise((resolve, reject) => {
-        shelljs.exec(command, { async: true, silent: false, cwd: npmDirectory }, code => {
-            if (code === 0) {
-                resolve(0);
-            }
-            else {
-                reject(new Error(`Error occurred while executing command "${command}". Exit code: ${code}`));
-            }
+async function shellExec(command) {
+    try {
+        const { exitCode } = await execa(command, {
+            cwd: npmDirectory,
+            stdio: 'inherit'
         });
-    });
+        return exitCode;
+    }
+    catch (error) {
+        throw new Error(`Error occurred while executing command "${command}". Exit code: ${error.exitCode}`);
+    }
 }
 
 const resolve = promisify(dns.resolve);
@@ -450,7 +451,13 @@ async function installRust() {
     }
 }
 function checkRustInstalled() {
-    return shelljs.exec('rustc --version', { silent: true }).code === 0;
+    try {
+        execaSync('rustc', ['--version']);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 
 async function combineFiles(files, output) {
@@ -529,9 +536,9 @@ async function mergeConfig(url, options, tauriConf) {
     // Processing targets are currently only open to Linux.
     if (platform === 'linux') {
         delete tauriConf.bundle.linux.deb.files;
-        const validTargets = ['all', 'deb', 'appimage', 'rpm'];
+        const validTargets = ['deb', 'appimage', 'rpm'];
         if (validTargets.includes(options.targets)) {
-            tauriConf.bundle.targets = options.targets === 'all' ? ['deb', 'appimage', 'rpm'] : [options.targets];
+            tauriConf.bundle.targets = [options.targets];
         }
         else {
             logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
@@ -639,6 +646,10 @@ async function mergeConfig(url, options, tauriConf) {
     await fsExtra.outputJSON(pakeConfigPath, tauriConf.pake, { spaces: 4 });
     let tauriConf2 = JSON.parse(JSON.stringify(tauriConf));
     delete tauriConf2.pake;
+    // delete tauriConf2.bundle;
+    {
+        tauriConf2.bundle = bundleConf.bundle;
+    }
     const configJsonPath = path.join(tauriConfigDirectory, 'tauri.conf.json');
     await fsExtra.outputJSON(configJsonPath, tauriConf2, { spaces: 4 });
 }
@@ -771,15 +782,23 @@ class LinuxBuilder extends BaseBuilder {
         super(options);
     }
     getFileName() {
-        const { name } = this.options;
-        const arch = process.arch === 'x64' ? 'amd64' : process.arch;
-        return `${name}_${tauriConfig.version}_${arch}`;
+        const { name, targets } = this.options;
+        const version = tauriConfig.version;
+        let arch = process.arch === 'x64' ? 'amd64' : process.arch;
+        if (arch === 'arm64' && (targets === 'rpm' || targets === 'appimage')) {
+            arch = 'aarch64';
+        }
+        // The RPM format uses different separators and version number formats
+        if (targets === 'rpm') {
+            return `${name}-${version}-1.${arch}`;
+        }
+        return `${name}_${version}_${arch}`;
     }
     // Customize it, considering that there are all targets.
     async build(url) {
-        const targetTypes = ['deb', 'appimage'];
+        const targetTypes = ['deb', 'appimage', 'rpm'];
         for (const target of targetTypes) {
-            if (this.options.targets === target || this.options.targets === 'all') {
+            if (this.options.targets === target) {
                 await this.buildAndCopy(url, target);
             }
         }