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

Fix the failure of compilation caused by spaces where nodejs is located

Browse Source
This commit is contained in:
Tlntin
2023-02-25 10:56:01 +08:00
parent cc815ca8d1
commit b18efd3e16
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/builders/LinuxBuilder.ts vendored
View File

@@ -46,7 +46,7 @@ export default class LinuxBuilder implements IBuilder {
const { name } = options; const { name } = options;
await mergeTauriConfig(url, options, tauriConf); await mergeTauriConfig(url, options, tauriConf);
await shellExec(`cd ${npmDirectory} && npm install && npm run build`); await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
let arch: string; let arch: string;
if (process.arch === "x64") { if (process.arch === "x64") {

4
bin/builders/MacBuilder.ts vendored
View File

@@ -41,10 +41,10 @@ export default class MacBuilder implements IBuilder {
await mergeTauriConfig(url, options, tauriConf); await mergeTauriConfig(url, options, tauriConf);
let dmgName: string; let dmgName: string;
if (options.multiArch) { if (options.multiArch) {
await shellExec(`cd ${npmDirectory} && npm install && npm run build:mac`); await shellExec(`cd "${npmDirectory}" && npm install && npm run build:mac`);
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`; dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
} else { } else {
await shellExec(`cd ${npmDirectory} && npm install && npm run build`); await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
let arch = "x64"; let arch = "x64";
if (process.arch === "arm64") { if (process.arch === "arm64") {
arch = "aarch64"; arch = "aarch64";

2
bin/builders/WinBulider.ts vendored
View File

@@ -45,7 +45,7 @@ export default class WinBuilder implements IBuilder {
await mergeTauriConfig(url, options, tauriConf); await mergeTauriConfig(url, options, tauriConf);
await shellExec(`cd ${npmDirectory} && npm install && npm run build`); await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
const language = tauriConf.tauri.bundle.windows.wix.language[0]; const language = tauriConf.tauri.bundle.windows.wix.language[0];
const arch = process.arch; const arch = process.arch;
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`; const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;

12
dist/cli.js vendored
View File

@@ -1552,7 +1552,7 @@ function getDomain(inputUrl) {
if (i === 0 || // 'asia.com' (last remaining must be the SLD) if (i === 0 || // 'asia.com' (last remaining must be the SLD)
i < ln - 2 || // TLDs only span 2 levels i < ln - 2 || // TLDs only span 2 levels
part.length < minLength || // 'www.cn.com' (valid TLD as second-level domain) part.length < minLength || // 'www.cn.com' (valid TLD as second-level domain)
tlds.indexOf(part) < 0 // officialy not a TLD tlds.indexOf(part) < 0 // officially not a TLD
) { ) {
return part; return part;
} }
@@ -2019,11 +2019,11 @@ class MacBuilder {
yield mergeTauriConfig(url, options, tauriConf); yield mergeTauriConfig(url, options, tauriConf);
let dmgName; let dmgName;
if (options.multiArch) { if (options.multiArch) {
yield shellExec(`cd ${npmDirectory} && npm install && npm run build:mac`); yield shellExec(`cd "${npmDirectory}" && npm install && npm run build:mac`);
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`; dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
} }
else { else {
yield shellExec(`cd ${npmDirectory} && npm install && npm run build`); yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
let arch = "x64"; let arch = "x64";
if (process.arch === "arm64") { if (process.arch === "arm64") {
arch = "aarch64"; arch = "aarch64";
@@ -2081,7 +2081,7 @@ class WinBuilder {
logger.debug('PakeAppOptions', options); logger.debug('PakeAppOptions', options);
const { name } = options; const { name } = options;
yield mergeTauriConfig(url, options, tauriConf); yield mergeTauriConfig(url, options, tauriConf);
yield shellExec(`cd ${npmDirectory} && npm install && npm run build`); yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
const language = tauriConf.tauri.bundle.windows.wix.language[0]; const language = tauriConf.tauri.bundle.windows.wix.language[0];
const arch = process.arch; const arch = process.arch;
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`; const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
@@ -2126,7 +2126,7 @@ class LinuxBuilder {
logger.debug('PakeAppOptions', options); logger.debug('PakeAppOptions', options);
const { name } = options; const { name } = options;
yield mergeTauriConfig(url, options, tauriConf); yield mergeTauriConfig(url, options, tauriConf);
yield shellExec(`cd ${npmDirectory} && npm install && npm run build`); yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
let arch; let arch;
if (process.arch === "x64") { if (process.arch === "x64") {
arch = "amd64"; arch = "amd64";
@@ -2217,7 +2217,7 @@ var exports = "./dist/pake.js";
var license = "MIT"; var license = "MIT";
var dependencies = { var dependencies = {
"@tauri-apps/api": "^1.2.0", "@tauri-apps/api": "^1.2.0",
"@tauri-apps/cli": "^1.2.2", "@tauri-apps/cli": "^1.2.3",
axios: "^1.1.3", axios: "^1.1.3",
chalk: "^5.1.2", chalk: "^5.1.2",
commander: "^9.4.1", commander: "^9.4.1",

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "pake-cli", "name": "pake-cli",
"version": "1.2.4", "version": "1.2.5",
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。", "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
"engines": { "engines": {
"node": ">=16.0.0" "node": ">=16.0.0"