Skip to content

overwrite pkg links on install #28

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

Merged
mxcl merged 2 commits into from
Feb 24, 2025
Merged

overwrite pkg links on install #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1323752
fix symlinks of broken pkgs on install
jhheider Feb 22, 2025
181b7f8
Merge branch 'main' into fix-resymlink-broken-installs
mxcl Feb 24, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
- run: ./pkgm.ts i pkgx.sh/brewkit
- run: /usr/local/bin/bk --help

- run: rm /usr/local/bin/bk
- run: test ! -f /usr/local/bin/bk
- run: ./pkgm.ts i pkgx.sh/brewkit
- run: /usr/local/bin/bk --help

- run: ./pkgm.ts li pkgx.sh/brewkit
- run: ~/.local/bin/bk --help

Expand Down
31 changes: 15 additions & 16 deletions pkgm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,6 @@ async function install(args: string[], basePath: string) {
// deno-lint-ignore no-explicit-any
const pkg_prefixes = json.pkgs.map((x: any) => `${x.project}/v${x.version}`);

const to_install = [];
for (const prefix of pkg_prefixes) {
if (!existsSync(join(`${basePath}/pkgs`, prefix))) {
to_install.push(prefix);
}
}

if (to_install.length === 0) {
console.error("pkgs already installed");
Deno.exit(0);
}

const self = fromFileUrl(import.meta.url);
const pkgx_dir = Deno.env.get("PKGX_DIR") || `${Deno.env.get("HOME")}/.pkgx`;
const needs_sudo = Deno.uid() != 0 && basePath === "/usr/local";
Expand All @@ -150,7 +138,7 @@ async function install(args: string[], basePath: string) {
pkgx_dir,
runtime_env,
basePath,
...to_install,
...pkg_prefixes,
];
let cmd = "";
if (needs_sudo) {
Expand Down Expand Up @@ -237,12 +225,16 @@ async function mirror_directory(dst: string, src: string, prefix: string) {
await processEntry(entrySourcePath, entryTargetPath);
}
} else if (fileInfo.isFile) {
// Remove the target file if it exists
if (existsSync(targetPath)) {
await Deno.remove(targetPath);
}
// Create a hard link for files
await Deno.link(sourcePath, targetPath);
} else if (fileInfo.isSymlink) {
// Recreate symlink in the target directory
const linkTarget = await Deno.readLink(sourcePath);
await Deno.symlink(linkTarget, targetPath);
symlink_with_overwrite(linkTarget, targetPath);
} else {
throw new Error(`unsupported file type at: ${sourcePath}`);
}
Expand Down Expand Up @@ -275,7 +267,7 @@ async function symlink(src: string, dst: string) {
if (existsSync(targetPath)) {
await Deno.remove(targetPath);
}
await Deno.symlink(sourcePath, targetPath);
symlink_with_overwrite(sourcePath, targetPath);
}
}
}
Expand Down Expand Up @@ -310,7 +302,7 @@ async function create_v_symlinks(prefix: string) {
}

for (const [key, value] of Object.entries(major_versions)) {
await Deno.symlink(`v${semver.format(value)}`, join(shelf, `v${key}`));
symlink_with_overwrite(`v${semver.format(value)}`, join(shelf, `v${key}`));
}
}

Expand All @@ -329,3 +321,10 @@ function expand_runtime_env(
}
return JSON.stringify(expanded);
}

function symlink_with_overwrite(src: string, dst: string) {
if (existsSync(dst)) {
Deno.removeSync(dst);
}
Deno.symlinkSync(src, dst);
}