blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add --eval flag to `solana-install info`

This commit is contained in:
Michael Vines 2020-10-20 12:09:12 -07:00 committed by mergify[bot]
parent f71677164f
commit 6f930351d2
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install/src/command.rs
View File

@ -568,9 +568,21 @@ fn release_channel_version_url(release_channel: &str) -> String {
)
}
pub fn info(config_file: &str, local_info_only: bool) -> Result<Option<UpdateManifest>, String> {
pub fn info(
config_file: &str,
local_info_only: bool,
eval: bool,
) -> Result<Option<UpdateManifest>, String> {
let config = Config::load(config_file)?;
if eval {
println!(
"SOLANA_INSTALL_ACTIVE_RELEASE={}",
&config.active_release_dir().to_str().unwrap_or("")
);
return Ok(None);
}
println_name_value("Configuration:", &config_file);
println_name_value(
"Active release directory:",
@ -753,7 +765,7 @@ fn symlink_dir<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> std::io::Resul
pub fn update(config_file: &str) -> Result<bool, String> {
let mut config = Config::load(config_file)?;
let update_manifest = info(config_file, false)?;
let update_manifest = info(config_file, false, false)?;
let release_dir = if let Some(explicit_release) = &config.explicit_release {
let (download_url, release_dir) = match explicit_release {

8
install/src/lib.rs
View File

@ -160,6 +160,11 @@ pub fn main() -> Result<(), String> {
.help(
"only display local information, don't check the cluster for new updates",
),
)
.arg(
Arg::with_name("eval")
.long("eval")
.help("display information in a format that can be used with `eval`"),
),
)
.subcommand(
@ -234,7 +239,8 @@ pub fn main() -> Result<(), String> {
("init", Some(matches)) => handle_init(&matches, &config_file),
("info", Some(matches)) => {
let local_info_only = matches.is_present("local_info_only");
command::info(config_file, local_info_only).map(|_| ())
let eval = matches.is_present("eval");
command::info(config_file, local_info_only, eval).map(|_| ())
}
("deploy", Some(matches)) => {
let from_keypair_file = matches.value_of("from_keypair_file").unwrap();