Skip to content

Commit 51d9d2c

Browse files
committed
don’t overwrite pkgx
Fixes #14 Fixes #17
1 parent e65843e commit 51d9d2c

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,8 @@ jobs:
2828
- uses: actions/checkout@v4
2929
- uses: pkgxdev/setup@v3
3030
- run: ./pkgm.ts i git
31+
32+
- run: /usr/local/bin/git --version
33+
34+
- run: ./pkgm.ts i pkgx.sh/brewkit
35+
- run: /usr/local/bin/bk --help

pkgm.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ async function sudo_install(
148148
) {
149149
const dst = "/usr/local";
150150
for (const pkg_prefix of pkg_prefixes) {
151+
if (pkg_prefix == "pkgx.sh") {
152+
// don’t overwrite ourselves
153+
// * https://github.com/pkgxdev/pkgm/issues/14
154+
// * https://github.com/pkgxdev/pkgm/issues/17
155+
continue;
156+
}
151157
// create /usr/local/pkgs/${prefix}
152158
await mirror_directory("/usr/local/pkgs", pkgx_dir, pkg_prefix);
153159
// symlink /usr/local/pkgs/${prefix} to /usr/local
@@ -158,6 +164,9 @@ async function sudo_install(
158164

159165
for (const [project, env] of Object.entries(runtime_env)) {
160166
const pkg_prefix = pkg_prefixes.find((x) => x.startsWith(project))!;
167+
if (pkg_prefix == "pkgx.sh") {
168+
continue;
169+
}
161170
for (const bin of ["bin", "sbin"]) {
162171
const bin_prefix = join("/usr/local/pkgs", pkg_prefix, bin);
163172

0 commit comments

Comments
 (0)