Merge pull request #36 from pkgxdev/faster-shims

Author: mxcl

.github/workflows/ci.yml

@@ -59,6 +59,9 @@ jobs:
       - run: ./pkgm.ts i curl
       - run: /usr/local/bin/curl -L pkgx.sh
 
+      - run: ./pkgm.ts shim semverator
+      - run: ~/.local/bin/semverator validate 1.0.0
+
       # TODO pending: https://github.com/pkgxdev/pantry/issues/8487
       # - 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

README.md

@@ -31,6 +31,7 @@ $ pkgm shim git
 # ^^ creates a shim for git in ~/.local/bin
 # these shims mimic the pkgx v1 lazy-loading shims, and are desirable for
 # certain types of self-healing and dev-setup containers, among other things
+# requires pkgx^2.4.0 for --shebang option
 
 $ pkgm list
 # ^^ lists what is installed

pkgm.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx --quiet deno^2.1 run --ext=ts --allow-sys=uid --allow-run --allow-env=PKGX_DIR,HOMEBREW_PREFIX,HOME,PATH --allow-read
+#!/usr/bin/env -S pkgx --quiet deno^2.1 run --ext=ts --allow-sys=uid --allow-run --allow-env=PKGX_DIR,HOMEBREW_PREFIX,HOME,PATH --allow-read --allow-write
 import { SemVer, semver } from "https://deno.land/x/libpkgx@v0.20.3/mod.ts";
 import { dirname, fromFileUrl, join } from "jsr:@std/path@^1";
 import { ensureDir, existsSync } from "jsr:@std/fs@^1";
@@ -212,8 +212,8 @@ async function shim(args: string[], basePath: string) {
       for await (const entry of Deno.readDir(bin_prefix)) {
         if (!entry.isFile && !entry.isSymlink) continue;
         const name = entry.name;
-        const shim = "#!/bin/sh\n\n" +
-          `exec ${pkgx} +${pkg.project}=${pkg.version} -- ${name} "$@"\n`;
+        const shim =
+          `#!/usr/bin/env -S pkgx +${pkg.project}=${pkg.version} --shebang --quiet -- ${name}`;
 
         if (existsSync(join(basePath, "bin", name))) {
           await Deno.remove(join(basePath, "bin", name));