(cherry picked from commit 41bda18046
)
This commit is contained in:
committed by
Michael Vines
parent
e6d6fc4391
commit
462d0cfc6c
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -2505,6 +2505,7 @@ dependencies = [
|
|||||||
name = "solana-install"
|
name = "solana-install"
|
||||||
version = "0.16.2"
|
version = "0.16.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -13,6 +13,7 @@ cuda = []
|
|||||||
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
atty = "0.2.11"
|
||||||
bincode = "1.1.4"
|
bincode = "1.1.4"
|
||||||
bs58 = "0.2.0"
|
bs58 = "0.2.0"
|
||||||
bzip2 = "0.3.3"
|
bzip2 = "0.3.3"
|
||||||
|
@ -1,22 +1,21 @@
|
|||||||
|
use atty;
|
||||||
use std::process::exit;
|
use std::process::exit;
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
fn press_enter() {
|
fn press_enter() {
|
||||||
// On windows, where installation happens in a console that may have opened just for this
|
// On windows, where installation happens in a console that may have opened just for this
|
||||||
// purpose, give the user an opportunity to see the error before the window closes.
|
// purpose, give the user an opportunity to see the error before the window closes.
|
||||||
println!();
|
if cfg!(windows) && atty::is(atty::Stream::Stdin) {
|
||||||
println!("Press the Enter key to continue.");
|
println!();
|
||||||
|
println!("Press the Enter key to continue.");
|
||||||
|
|
||||||
use std::io::BufRead;
|
use std::io::BufRead;
|
||||||
let stdin = std::io::stdin();
|
let stdin = std::io::stdin();
|
||||||
let stdin = stdin.lock();
|
let stdin = stdin.lock();
|
||||||
let mut lines = stdin.lines();
|
let mut lines = stdin.lines();
|
||||||
lines.next();
|
lines.next();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
fn press_enter() {}
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
solana_install::main_init().unwrap_or_else(|err| {
|
solana_install::main_init().unwrap_or_else(|err| {
|
||||||
println!("Error: {}", err);
|
println!("Error: {}", err);
|
||||||
|
Reference in New Issue
Block a user