avm: Install from version-commit and refactor (#2671)

CHANGELOG.md

@@ -33,6 +33,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - cli: Add `test.upgradeable`, `test.genesis.upgradeable` setting in anchor.toml to support testing upgradeable programs ([#2641](https://github.com/coral-xyz/anchor/pull/2642)).
 - cli, client, lang, spl: Update Solana toolchain and dependencies to `1.17.0`, `1.16` remains supported ([#2645](https://github.com/coral-xyz/anchor/pull/2645)).
 - spl: Add support for memo program ([#2661](https://github.com/coral-xyz/anchor/pull/2661)).
+- avm: Add `anchor-cli` installation from commit ([#2659](https://github.com/coral-xyz/anchor/pull/2659)).
 - cli: Add `toolchain` property in `Anchor.toml` to override Anchor and Solana versions ([#2649](https://github.com/coral-xyz/anchor/pull/2649)).
 
 ### Fixes

avm/Cargo.toml

@@ -15,11 +15,11 @@ path = "src/anchor/main.rs"
 [dependencies]
 anyhow = "1.0.32"
 cfg-if = "1.0.0"
+cargo_toml = "0.15.3"
 clap = { version = "4.2.4", features = ["derive"] }
 dirs = "4.0.0"
 once_cell = "1.8.0"
 reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "json", "rustls-tls"] }
 semver = "1.0.4"
 serde = { version = "1.0.136", features = ["derive"] }
 tempfile = "3.3.0"
-cargo_toml = "0.15.3"

avm/src/anchor/main.rs

@@ -1,4 +1,4 @@
-use std::{env, fs, process::Command};
+use std::{env, process::Command};
 
 fn main() -> anyhow::Result<()> {
     let args = env::args().skip(1).collect::<Vec<String>>();
@@ -7,13 +7,14 @@ fn main() -> anyhow::Result<()> {
         .map_err(|_e| anyhow::anyhow!("Anchor version not set. Please run `avm use latest`."))?;
 
     let binary_path = avm::version_binary_path(&version);
-    if fs::metadata(&binary_path).is_err() {
+    if !binary_path.exists() {
         anyhow::bail!(
             "anchor-cli {} not installed. Please run `avm use {}`.",
             version,
             version
         );
     }
+
     let exit = Command::new(binary_path)
         .args(args)
         .spawn()?