Merge 09b1e76 into ba219da

pkgxdev · May 12, 2024 · 2b357df · 2b357df
2 parents ba219da + 09b1e76
commit 2b357df
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 7 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -74,7 +74,7 @@ export default async function({ flags, ...opts }: Args, logger_prefix?: string)
   case 'install':
     try {
       await ensure_pantry()
-      await install(await Promise.all(opts.args.map(x => parse_pkg_str(x, {latest: 'ok'}))))
+      await install(await Promise.all(opts.args.map(x => parse_pkg_str(x, {latest: 'ok'}))), flags.unsafe)
     } catch (err) {
       if (err instanceof AmbiguityError) {
         err.ctx = 'install'

diff --git a/src/modes/install.ts b/src/modes/install.ts
@@ -6,7 +6,13 @@ const { usePantry } = hooks
 
 // * maybe impl `$XDG_BIN_HOME`
 
-export default async function(pkgs: PackageRequirement[]) {
+export function is_unsafe(unsafe: boolean): boolean {
+  // `--unsafe` takes precedence over the `$PKGX_UNSAFE_INSTALL` flag
+  const IS_UNSAFE = parseInt(Deno.env.get("PKGX_UNSAFE_INSTALL") || "0") ? true : unsafe;
+  return IS_UNSAFE;
+}
+
+export default async function(pkgs: PackageRequirement[], unsafe: boolean) {
   const usrlocal = new Path("/usr/local/bin")
   let n = 0
 
@@ -30,6 +36,7 @@ export default async function(pkgs: PackageRequirement[]) {
   }
 
   async function write(dst: Path, pkgs: PackageRequirement[]) {
+    const UNSAFE = is_unsafe(unsafe);
     for (const pkg of pkgs) {
       const programs = await usePantry().project(pkg).provides()
       program_loop:
@@ -39,7 +46,30 @@ export default async function(pkgs: PackageRequirement[]) {
         if (program.includes("{{")) continue
 
         const pkgstr = utils.pkg.str(pkg)
-        const exec = `exec pkgx +${pkgstr} -- ${program} "$@"`
+        if (UNSAFE) {
+          const parts = pkgstr.split("/")
+          parts.pop()
+          await Deno.mkdir(Path.home().join(`.cache/pkgx/envs/${parts.join("/")}`).toString(), {recursive: true})
+        }
+        //FIXME: doing `set -a` clears the args env
+        const exec = UNSAFE ? undent`
+            ARGS="$@"
+            pkgx_resolve() {
+              mkdir -p "$(dirname \\"$\{XDG_CACHE_DIR:-$HOME/.cache\}/pkgx/envs/${pkgstr}.env\\")"
+              pkgx +${pkgstr} 1>"$\{XDG_CACHE_DIR:-$HOME/.cache\}/pkgx/envs/${pkgstr}.env"
+              run
+            }
+            run() {
+              if [[ -e "$\{XDG_CACHE_DIR:-$HOME/.cache\}/pkgx/envs/${pkgstr}.env" && -e "$\{PKGX_HOME:-$HOME/.pkgx\}/${pkgstr}/v*/bin/${program}" ]]; then
+                set -a
+                source "$\{XDG_CACHE_DIR:-$HOME/.cache\}/pkgx/envs/${pkgstr}.env"
+                exec "$\{PKGX_HOME:-$HOME/.pkgx\}/${pkgstr}/v*/bin/${program}" "$ARGS"
+              else
+                pkgx_resolve
+              fi
+            }
+            run
+          ` : `exec pkgx +${pkgstr} -- ${program} "$@"`
         const script = undent`
           if [ "$PKGX_UNINSTALL" != 1 ]; then
             ${exec}
@@ -65,7 +95,7 @@ export default async function(pkgs: PackageRequirement[]) {
             if (done) {
               throw new PkgxError(`${f} already exists and is not a pkgx installation`)
             }
-            const found = value.match(/^\s*exec pkgx \+([^ ]+)/)?.[1]
+            const found = value.match(/^\s*pkgx \+([^ ]+)/)?.[1]
             if (found) {
               n++
               console.warn(`pkgx: already installed: ${blurple(program)} ${dim(`(${found})`)}`)

diff --git a/src/modes/uninstall.ts b/src/modes/uninstall.ts
@@ -1,5 +1,5 @@
 import parse_pkg_str from "../prefab/parse-pkg-str.ts"
-import { hooks, PackageRequirement, Path, PkgxError } from "pkgx"
+import { hooks, PackageRequirement, Path, PkgxError, utils } from "pkgx"
 
 export default async function(pkgspecs: string[]) {
   const pkgs = await Promise.all(pkgspecs.map(x => parse_pkg_str(x, {latest: 'ok'})))
@@ -11,6 +11,15 @@ export default async function(pkgspecs: string[]) {
 async function uninstall(prefix: Path, pkgs: PackageRequirement[]) {
   for (const pkg of pkgs) {
     const programs = await hooks.usePantry().project(pkg).provides()
+    const pkgstr = utils.pkg.str(pkg)
+    const parts = pkgstr.split("/")
+    parts.pop()
+    //FIXME: it removes the dir successfully. however, it still complains that it didn't delete that
+    try {
+      await Deno.remove(Path.home().join(`.cache/pkgx/envs/${parts}`).toString(), {recursive: true})
+    } catch (e) {
+      console.warn(e);
+    }
     for (const program of programs) {
       const f = prefix.join(program)
       if (f.isFile()) {

diff --git a/src/parse-args.ts b/src/parse-args.ts
@@ -45,7 +45,8 @@ interface Flags {
   sync: boolean
   update: boolean
   verbosity?: number
-  keepGoing: boolean
+  keepGoing: boolean,
+  unsafe: boolean
 }
 
 export default function(input: string[]): Args {
@@ -56,7 +57,8 @@ export default function(input: string[]): Args {
   const flags: Flags = {
     sync: false,
     update: false,
-    keepGoing: false
+    keepGoing: false,
+    unsafe: false
   }
   let mode: string | undefined
   let dryrun: boolean | undefined
@@ -89,6 +91,9 @@ export default function(input: string[]): Args {
       case 'update':
         flags.update = true
         break
+      case 'unsafe':
+        flags.unsafe = true
+        break
       case 'provides':
         if (mode) throw new UsageError({msg: 'multiple modes specified'})
         console.error("%cdeprecated: %cuse pkgx --provider instead", 'color: red', 'color: initial')