Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(install): add support for --unsafe install flag #1008

Merged
merged 18 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
36 changes: 33 additions & 3 deletions src/modes/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand All @@ -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()
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
await Deno.mkdir(Path.home().join(`.cache/pkgx/envs/${parts.join("/")}`).toString(), {recursive: true})
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
}
//FIXME: doing `set -a` clears the args env
const exec = UNSAFE ? undent`
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
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"
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
else
pkgx_resolve
fi
}
run
` : `exec pkgx +${pkgstr} -- ${program} "$@"`
const script = undent`
if [ "$PKGX_UNINSTALL" != 1 ]; then
${exec}
Expand All @@ -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]
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
if (found) {
n++
console.warn(`pkgx: already installed: ${blurple(program)} ${dim(`(${found})`)}`)
Expand Down
11 changes: 10 additions & 1 deletion src/modes/uninstall.ts
Original file line number Diff line number Diff line change
@@ -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'})))
Expand All @@ -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})
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
} catch (e) {
console.warn(e);
}
for (const program of programs) {
const f = prefix.join(program)
if (f.isFile()) {
Expand Down
9 changes: 7 additions & 2 deletions src/parse-args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ interface Flags {
sync: boolean
update: boolean
verbosity?: number
keepGoing: boolean
keepGoing: boolean,
unsafe: boolean
}

export default function(input: string[]): Args {
Expand All @@ -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
Expand Down Expand Up @@ -89,6 +91,9 @@ export default function(input: string[]): Args {
case 'update':
flags.update = true
break
case 'unsafe':
flags.unsafe = true
rustdevbtw marked this conversation as resolved.
Show resolved Hide resolved
break
case 'provides':
if (mode) throw new UsageError({msg: 'multiple modes specified'})
console.error("%cdeprecated: %cuse pkgx --provider instead", 'color: red', 'color: initial')
Expand Down