From 2bdf913c2d4cdf6a8b6a534007856b9ff7f6f7a6 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Sat, 29 Mar 2025 08:40:59 -0400 Subject: [PATCH] Bump libpkgx Fixes #59 --- .github/workflows/ci.yml | 12 ++++++++++++ pkgm.ts | 7 +++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83b8c35..6e0db2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,3 +76,15 @@ jobs: # - run: ./pkgm.ts i xpra.org # https://github.com/pkgxdev/pkgm/issues/13 # - run: ls -la /usr/local/pkgs/xpra.org/v6.2.3/venv/bin # - run: xpra --version + + # verifies that libpkgx is creating the pantry at the right place + # Refs: https://github.com/pkgxdev/pkgm/issues/59 + - run: | + ./pkgm.ts i semverator + if test -d /tmp/foo/pkgx; then + test $(uname) = Linux + else + test $(uname) = Darwin + fi + env: + XDG_DATA_HOME: /tmp/foo diff --git a/pkgm.ts b/pkgm.ts index 5d08788..a61d8ee 100755 --- a/pkgm.ts +++ b/pkgm.ts @@ -7,12 +7,11 @@ import { SemVer, semver, utils, -} from "https://deno.land/x/libpkgx@v0.20.3/mod.ts"; -import { dirname, join } from "jsr:@std/path@^1"; +} from "https://deno.land/x/libpkgx@v0.21.0/mod.ts"; +import { basename, dirname, join } from "jsr:@std/path@^1"; import { ensureDir, existsSync, walk } from "jsr:@std/fs@^1"; import { parseArgs } from "jsr:@std/cli@^1"; -import hydrate from "https://deno.land/x/libpkgx@v0.20.3/src/plumbing/hydrate.ts"; -import { basename } from "node:path"; +const { hydrate } = plumbing; function standardPath() { let path = "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";