Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Skip deno upgrade unless installed under .deno #750

Merged
merged 2 commits into from
Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Use base_dirs from execution context
  • Loading branch information
tranzystorekk committed Aug 8, 2021
commit 87bd70fe76f178bbfa24dc728b345fd43c37e30f
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ fn run() -> Result<()> {
runner.execute(Step::Vim, "voom", || vim::run_voom(&base_dirs, run_type))?;
runner.execute(Step::Node, "npm", || node::run_npm_upgrade(&ctx))?;
runner.execute(Step::Pnpm, "pnpm", || node::pnpm_global_update(run_type))?;
runner.execute(Step::Deno, "deno", || node::deno_upgrade(&base_dirs, &ctx))?;
runner.execute(Step::Deno, "deno", || node::deno_upgrade(&ctx))?;
runner.execute(Step::Composer, "composer", || generic::run_composer_update(&ctx))?;
runner.execute(Step::Krew, "krew", || generic::run_krew_upgrade(run_type))?;
runner.execute(Step::Gem, "gem", || generic::run_gem(&base_dirs, run_type))?;
Expand Down
4 changes: 2 additions & 2 deletions src/steps/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ pub fn pnpm_global_update(run_type: RunType) -> Result<()> {
run_type.execute(&pnpm).args(&["update", "-g"]).check_run()
}

pub fn deno_upgrade(base_dirs: &BaseDirs, ctx: &ExecutionContext) -> Result<()> {
pub fn deno_upgrade(ctx: &ExecutionContext) -> Result<()> {
let deno = require("deno")?;
let deno_dir = base_dirs.home_dir().join(".deno");
let deno_dir = ctx.base_dirs().home_dir().join(".deno");

if !deno.canonicalize()?.is_descendant_of(&deno_dir) {
let skip_reason = SkipStep("Deno installed outside of .deno directory".to_string());
Expand Down