Skip to content

# feat(install): 目录条目展开为子级安装，支持与用户自定义 skills 共存 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranger1112 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

# feat(install): 目录条目展开为子级安装，支持与用户自定义 skills 共存 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 46 additions & 19 deletions bin/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,13 @@ function runUninstall(tgt) {
if (fs.existsSync(targetPath)) {
rmSafe(targetPath);
console.log(` ${c.red('✘')} ${manifestLabel(entry, tgt)}`);
if (normalized.root !== tgt) {
let parent = path.dirname(targetPath);
while (parent !== installRoot && parent !== path.dirname(parent)) {
try {
if (fs.readdirSync(parent).length > 0) break;
fs.rmdirSync(parent);
} catch { break; }
parent = path.dirname(parent);
}
let parent = path.dirname(targetPath);
while (parent !== installRoot && parent !== path.dirname(parent)) {
try {
if (fs.readdirSync(parent).length > 0) break;
fs.rmdirSync(parent);
} catch { break; }
parent = path.dirname(parent);
}
}
});
Expand Down Expand Up @@ -694,17 +692,46 @@ function installCore(tgt, selectedStyle, selectedPersona, packPlan) {
warn(`跳过: ${src}`); return;
}

if (fs.existsSync(destPath)) {
const backupPath = path.join(backupDir, rootName, dest);
rmSafe(backupPath);
copyRecursive(destPath, backupPath);
pushManifestEntry(manifest.backups, rootName, dest);
info(`备份: ${c.d(rootName === tgt ? dest : `${rootName}/${dest}`)}`);
let srcStat;
try { srcStat = fs.statSync(srcPath); } catch (e) {
warn(`无法读取源: ${srcPath}`); return;
}

if (srcStat.isDirectory()) {
let children;
try { children = fs.readdirSync(srcPath); } catch (e) {
warn(`无法读取目录: ${srcPath}`); return;
}
children.filter(child => !shouldSkip(child)).forEach(child => {
const childSrc = path.join(srcPath, child);
const childDest = path.join(destPath, child);
const childRelPath = path.posix.join(dest, child);

if (fs.existsSync(childDest)) {
const backupPath = path.join(backupDir, rootName, childRelPath);
rmSafe(backupPath);
copyRecursive(childDest, backupPath);
pushManifestEntry(manifest.backups, rootName, childRelPath);
info(`备份: ${c.d(rootName === tgt ? childRelPath : `${rootName}/${childRelPath}`)}`);
}
ok(rootName === tgt ? childRelPath : `${rootName}/${childRelPath}`);
rmSafe(childDest);
copyRecursive(childSrc, childDest);
pushManifestEntry(manifest.installed, rootName, childRelPath);
});
} else {
if (fs.existsSync(destPath)) {
const backupPath = path.join(backupDir, rootName, dest);
rmSafe(backupPath);
copyRecursive(destPath, backupPath);
pushManifestEntry(manifest.backups, rootName, dest);
info(`备份: ${c.d(rootName === tgt ? dest : `${rootName}/${dest}`)}`);
}
ok(rootName === tgt ? dest : `${rootName}/${dest}`);
rmSafe(destPath);
copyRecursive(srcPath, destPath);
pushManifestEntry(manifest.installed, rootName, dest);
}
ok(rootName === tgt ? dest : `${rootName}/${dest}`);
rmSafe(destPath);
copyRecursive(srcPath, destPath);
pushManifestEntry(manifest.installed, rootName, dest);
});

pushPackReport(manifest, {
Expand Down
8 changes: 4 additions & 4 deletions bin/uninstall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ console.log(`\n🗑️ 卸载 Code Abyss v${manifest.version}...\n`);
if (fs.existsSync(p)) {
fs.rmSync(p, { recursive: true, force: true });
console.log(`🗑️ 删除: ${entryLabel(entry)}`);
if (typeof entry !== 'string' && entry.root !== manifest.target) {
const rootDir = path.join(os.homedir(), MANAGED_ROOTS[entry.root] || '');
pruneEmptyParents(path.dirname(p), rootDir);
}
const rootDir = typeof entry !== 'string'
? path.join(os.homedir(), MANAGED_ROOTS[entry.root] || '')
: targetDir;
pruneEmptyParents(path.dirname(p), rootDir);
}
});

Expand Down