technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: compile for macOS and Windows

Browse source
This commit is contained in:
iff 2024-11-18 15:29:45 +01:00
parent 409b8245e6
commit 508e61a451
3 changed files with 78 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/suggestions.rs
View file

@ -1,5 +1,4 @@
use std::io::stderr;
use std::os::fd::AsFd;
use std::process::{exit, Stdio};
use std::time::{Duration, Instant};
@ -224,17 +223,7 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
command = expand_alias_multiline(shell, &command);
let now = Instant::now();
let process = std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(&command)
// .stdout(Stdio::inherit())
.stdout(stderr().as_fd().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap();
let process = run_suggestion_p(shell, p, &command);
if process.success() {
let cd = shell_evaluated_commands(shell, &command);
@ -262,16 +251,7 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
let command = expand_alias_multiline(shell, command);
let now = Instant::now();
let process = std::process::Command::new(shell)
.arg("-c")
.arg(&command)
// .stdout(Stdio::inherit())
.stdout(stderr().as_fd().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap();
let process = run_suggestion(shell, &command);
if process.success() {
let cd = shell_evaluated_commands(shell, &command);
@ -296,3 +276,62 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
Err(error_msg.to_string())
}
}
#[cfg(not(target_os = "windows"))]
fn run_suggestion_p (shell: &str, p: &str, command: &str) -> std::process::ExitStatus {
use std::os::fd::AsFd;
std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(command)
.stdout(stderr().as_fd().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}
#[cfg(not(target_os = "windows"))]
fn run_suggestion (shell: &str, command: &str) -> std::process::ExitStatus {
use std::os::fd::AsFd;
std::process::Command::new(shell)
.arg("-c")
.arg(command)
// .stdout(Stdio::inherit())
.stdout(stderr().as_fd().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}
#[cfg(target_os = "windows")]
fn run_suggestion_p (shell: &str, p: &str, command: &str) -> std::process::ExitStatus {
use std::os::windows::io::AsHandle;
std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(command)
.stdout(stderr().as_handle().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}
#[cfg(target_os = "windows")]
fn run_suggestion (shell: &str, command: &str) -> std::process::ExitStatus {
use std::os::windows::io::AsHandle;
std::process::Command::new(shell)
.arg("-c")
.arg(command)
.stdout(stderr().as_handle().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}