gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install: more little window fixes (#4930)

Browse Source 
* Only add .exe extension if no extension was given

* Switch to ctrlc crate for freebie Windows ^C handling
This commit is contained in:
Michael Vines
2019-07-03 17:45:08 -07:00
committed by GitHub
parent b4aebbd991
commit 3557975c1f
3 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
install/src/command.rs
View File

@@ -750,7 +750,7 @@ pub fn run(
let config = Config::load(config_file)?;
let mut full_program_path = config.active_release_bin_dir().join(program_name);
if cfg!(windows) {
if cfg!(windows) && full_program_path.extension().is_none() {
full_program_path.set_extension("exe");
}
@@ -764,18 +764,11 @@ pub fn run(
let mut child_option: Option<std::process::Child> = None;
let mut now = Instant::now();
let (_signal_sender, signal_receiver) = mpsc::channel();
#[cfg(not(windows))]
{
use signal_hook::{iterator::Signals, SIGTERM};
let signals = Signals::new(&[SIGTERM]).unwrap();
std::thread::spawn(move || {
for sig in signals.forever() {
eprintln!("run: received signal {:?}", sig);
let _ = _signal_sender.send(());
}
});
}
let (signal_sender, signal_receiver) = mpsc::channel();
ctrlc::set_handler(move || {
let _ = signal_sender.send(());
})
.expect("Error setting Ctrl-C handler");
loop {
child_option = match child_option {