Implemented the pause in tmux in a different way

This commit is contained in:
Roey Darwish Dror
2019-06-13 09:21:39 +03:00
parent 9430ab30f6
commit e5d0f4cbfa
3 changed files with 49 additions and 23 deletions

View File

@@ -68,7 +68,7 @@ fn run() -> Result<(), Error> {
let base_dirs = directories::BaseDirs::new().ok_or(ErrorKind::NoBaseDirectories)?;
let config = Config::load(&base_dirs)?;
if config.run_in_tmux() && env::var("TMUX").is_err() {
if config.run_in_tmux() && env::var("TOPGRADE_INSIDE_TMUX").is_err() {
#[cfg(unix)]
{
tmux::run_in_tmux();
@@ -498,6 +498,11 @@ fn run() -> Result<(), Error> {
freebsd::audit_packages(&sudo).ok();
}
if env::var("TOPGRADE_KEEP_END").is_ok() {
println!("\nPress any key to continue");
pause();
}
if report.data().iter().all(|(_, succeeded)| *succeeded) {
Ok(())
} else {