diff --git a/.gitignore b/.gitignore index f85b77a..01774e8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ dist !dist/about_pake.html !dist/cli.js !dist/.gitkeep +src-tauri/.cargo/config diff --git a/bin/builders/LinuxBuilder.ts b/bin/builders/LinuxBuilder.ts index f41e7ca..16671db 100644 --- a/bin/builders/LinuxBuilder.ts +++ b/bin/builders/LinuxBuilder.ts @@ -54,7 +54,6 @@ export default class LinuxBuilder implements IBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs.copyFile(project_cn_conf, project_conf); - fs.unlink(project_cn_conf); const _ = await shellExec( `cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build` diff --git a/bin/builders/MacBuilder.ts b/bin/builders/MacBuilder.ts index 897c60b..331b91b 100644 --- a/bin/builders/MacBuilder.ts +++ b/bin/builders/MacBuilder.ts @@ -49,7 +49,6 @@ export default class MacBuilder implements IBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs.copyFile(project_cn_conf, project_conf); - fs.unlink(project_cn_conf); const _ = await shellExec( `cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build:mac` diff --git a/bin/builders/WinBulider.ts b/bin/builders/WinBulider.ts index f845e54..a1c95e0 100644 --- a/bin/builders/WinBulider.ts +++ b/bin/builders/WinBulider.ts @@ -55,7 +55,6 @@ export default class WinBuilder implements IBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs.copyFile(project_cn_conf, project_conf); - fs.unlink(project_cn_conf); const _ = await shellExec( `cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build` diff --git a/bin/helpers/rust.ts b/bin/helpers/rust.ts index cec439d..089397c 100644 --- a/bin/helpers/rust.ts +++ b/bin/helpers/rust.ts @@ -29,5 +29,5 @@ export async function installRust() { } export function checkRustInstalled() { - return shelljs.exec('source "$HOME/.cargo/env" && rustc --version', { silent: true }).code === 0; + return shelljs.exec('rustc --version', { silent: true }).code === 0; } diff --git a/dist/cli.js b/dist/cli.js index c0bfe66..949483a 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -2084,7 +2084,7 @@ function installRust() { }); } function checkRustInstalled() { - return shelljs.exec('source "$HOME/.cargo/env" && rustc --version', { silent: true }).code === 0; + return shelljs.exec('rustc --version', { silent: true }).code === 0; } var tauri$3 = { @@ -2309,7 +2309,6 @@ class MacBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs$1.copyFile(project_cn_conf, project_conf); - fs$1.unlink(project_cn_conf); yield shellExec(`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build:mac`); } else { @@ -2389,7 +2388,6 @@ class WinBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs$1.copyFile(project_cn_conf, project_conf); - fs$1.unlink(project_cn_conf); yield shellExec(`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build`); } else { @@ -2446,7 +2444,6 @@ class LinuxBuilder { const project_cn_conf = path.join(rust_project_dir, "cn_config.bak"); const project_conf = path.join(rust_project_dir, "config"); fs$1.copyFile(project_cn_conf, project_conf); - fs$1.unlink(project_cn_conf); yield shellExec(`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build`); } else {