Merge branch 'main' into build-fix

pkgxdev · Oct 19, 2023 · cf0dfa3 · cf0dfa3
2 parents d46133e + a9c140e
commit cf0dfa3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -27,6 +27,11 @@ You can build for Linux (via Docker) using `-L`, e.g.:
 pkg -L build
 ```
 
+To run `pkg` without shellcode you can do eg. `pkgx +brewkit -- pkg build`,
+this is necessary because `pkg` is not listed as a provided program by brewkit
+since many other projects have decided to provide `pkg` and we didn’t want
+to trump them.
+
 ## Some Details
 
 * The `pkg build` environment ensures you have a c/c++ compiler and `make`

diff --git a/bin/run b/bin/run
@@ -1,8 +1,10 @@
 #!/usr/bin/env -S pkgx +deno bash +exo pipefail
 
 cmd() {
+  d="$(cd "$(dirname "$0")"/.. && pwd)
+
   deno run -A - <<EoTS
-    import parse_pkg_str from '../lib/run/parse-pkg-str.ts'
+    import parse_pkg_str from '$d/lib/run/parse-pkg-str.ts'
     import { hooks } from 'pkgx'
 
     const pkg = await parse_pkg_str('$1')