Skip to content

Commit

Permalink
CI: Do not crash on empty terminal (#2749)
Browse files Browse the repository at this point in the history
* Add warning
  • Loading branch information
quentinlesceller authored and ignopeverell committed Apr 11, 2019
1 parent 108bdba commit fb7fd62
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bin/cmd/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ pub fn client_command(client_args: &ArgMatches<'_>, global_config: GlobalConfig)
pub fn show_status(config: &ServerConfig, api_secret: Option<String>) {
println!();
let title = format!("Grin Server Status");
if term::stdout().is_none() {
println!("Could not open terminal");
return;
}
let mut t = term::stdout().unwrap();
let mut e = term::stdout().unwrap();
t.fg(term::color::MAGENTA).unwrap();
Expand Down
12 changes: 12 additions & 0 deletions wallet/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ pub fn outputs(
account, cur_height
);
println!();
if term::stdout().is_none() {
println!("Could not open terminal");
return Ok(());
}
let mut t = term::stdout().unwrap();
t.fg(term::color::MAGENTA).unwrap();
writeln!(t, "{}", title).unwrap();
Expand Down Expand Up @@ -132,6 +136,10 @@ pub fn txs(
account, cur_height
);
println!();
if term::stdout().is_none() {
println!("Could not open terminal");
return Ok(());
}
let mut t = term::stdout().unwrap();
t.fg(term::color::MAGENTA).unwrap();
writeln!(t, "{}", title).unwrap();
Expand Down Expand Up @@ -405,6 +413,10 @@ pub fn accounts(acct_mappings: Vec<AcctPathMapping>) {
pub fn tx_messages(tx: &TxLogEntry, dark_background_color_scheme: bool) -> Result<(), Error> {
let title = format!("Transaction Messages - Transaction '{}'", tx.id,);
println!();
if term::stdout().is_none() {
println!("Could not open terminal");
return Ok(());
}
let mut t = term::stdout().unwrap();
t.fg(term::color::MAGENTA).unwrap();
writeln!(t, "{}", title).unwrap();
Expand Down

0 comments on commit fb7fd62

Please sign in to comment.