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

修复递归拷贝功能报错的bug

Browse Source
This commit is contained in:
Tlntin
2022-12-29 13:59:51 +08:00
parent ad2887cdad
commit 09d0300b3b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/builders/common.ts vendored
View File

@@ -1,5 +1,5 @@
import { PakeAppOptions } from '@/types.js'; import { PakeAppOptions } from '@/types.js';
import prompts from 'prompts'; import prompts, { override } from 'prompts';
import path from 'path'; import path from 'path';
import fs from 'fs/promises'; import fs from 'fs/promises';
import fs2 from 'fs-extra'; import fs2 from 'fs-extra';
@@ -83,13 +83,14 @@ export async function mergeTauriConfig(
} else { } else {
const old_dir = path.join(npmDirectory,"dist/"); const old_dir = path.join(npmDirectory,"dist/");
const new_dir = path.join(npmDirectory,"dist_bak/"); const new_dir = path.join(npmDirectory,"dist_bak/");
fs.rename(old_dir, new_dir); fs2.moveSync(old_dir, new_dir, {"overwrite": true});
fs2.copy(dir_name, old_dir); fs2.copySync(dir_name, old_dir, {"overwrite": true});
// logger.warn("dir name", dir_name);
// 将dist_bak里面的cli.js和about_pake.html拷贝回去 // 将dist_bak里面的cli.js和about_pake.html拷贝回去
const cli_path = path.join(new_dir, "cli.js") const cli_path = path.join(new_dir, "cli.js")
const cli_path_target = path.join(old_dir, "cli.js") const cli_path_target = path.join(old_dir, "cli.js")
const about_pake_path = path.join(new_dir, "about_pake.html"); const about_pake_path = path.join(new_dir, "about_pake.html");
const about_patk_path_target = path.join(new_dir, "about_pake.html") const about_patk_path_target = path.join(old_dir, "about_pake.html")
fs.copyFile(cli_path, cli_path_target); fs.copyFile(cli_path, cli_path_target);
fs.copyFile(about_pake_path, about_patk_path_target); fs.copyFile(about_pake_path, about_patk_path_target);
} }

7
dist/cli.js vendored
View File

@@ -1682,13 +1682,14 @@ function mergeTauriConfig(url, options, tauriConf) {
else { else {
const old_dir = path.join(npmDirectory, "dist/"); const old_dir = path.join(npmDirectory, "dist/");
const new_dir = path.join(npmDirectory, "dist_bak/"); const new_dir = path.join(npmDirectory, "dist_bak/");
fs$1.rename(old_dir, new_dir); fs2.moveSync(old_dir, new_dir, { "overwrite": true });
fs2.copy(dir_name, old_dir); fs2.copySync(dir_name, old_dir, { "overwrite": true });
// logger.warn("dir name", dir_name);
// 将dist_bak里面的cli.js和about_pake.html拷贝回去 // 将dist_bak里面的cli.js和about_pake.html拷贝回去
const cli_path = path.join(new_dir, "cli.js"); const cli_path = path.join(new_dir, "cli.js");
const cli_path_target = path.join(old_dir, "cli.js"); const cli_path_target = path.join(old_dir, "cli.js");
const about_pake_path = path.join(new_dir, "about_pake.html"); const about_pake_path = path.join(new_dir, "about_pake.html");
const about_patk_path_target = path.join(new_dir, "about_pake.html"); const about_patk_path_target = path.join(old_dir, "about_pake.html");
fs$1.copyFile(cli_path, cli_path_target); fs$1.copyFile(cli_path, cli_path_target);
fs$1.copyFile(about_pake_path, about_patk_path_target); fs$1.copyFile(about_pake_path, about_patk_path_target);
} }