Compare commits

..

No commits in common. "master" and "v0.1.1" have entirely different histories.

5 changed files with 10 additions and 33 deletions

2
Cargo.lock generated
View file

@ -592,7 +592,7 @@ dependencies = [
[[package]] [[package]]
name = "ntfy-run" name = "ntfy-run"
version = "0.1.2" version = "0.1.1"
dependencies = [ dependencies = [
"clap", "clap",
"itertools", "itertools",

View file

@ -1,19 +1,7 @@
[package] [package]
name = "ntfy-run" name = "ntfy-run"
version = "0.1.2" version = "0.1.1"
edition = "2021" edition = "2021"
authors = ["Quantum <me@quantum5.ca>"]
description = "ntfy-run is a tool to run a command, capture its output, and send it to a ntfy server."
readme = "README.md"
homepage = "https://github.com/quantum5/ntfy-run"
repository = "https://github.com/quantum5/ntfy-run"
license = "GPL-3.0-or-later"
keywords = ["ntfy", "cron", "notifications", "utility"]
categories = ["command-line-interface"]
exclude = [
".github/*"
]
[dependencies] [dependencies]
clap = { version = "4.5.20", features = ["derive", "env"] } clap = { version = "4.5.20", features = ["derive", "env"] }

View file

@ -16,13 +16,7 @@ sudo wget https://github.com/quantum5/ntfy-run/releases/latest/download/ntfy-run
sudo chmod a+x /usr/local/bin/ntfy-run sudo chmod a+x /usr/local/bin/ntfy-run
``` ```
You can also install the latest release with `cargo`: Alternatively, build it yourself:
```bash
cargo install ntfy-run
```
Finally, you can build the latest Git version yourself:
```bash ```bash
git clone https://github.com/quantum5/ntfy-run.git git clone https://github.com/quantum5/ntfy-run.git

View file

@ -1,13 +1,13 @@
use crate::runner::{CaptureError, CapturedOutput}; use crate::runner::CaptureError;
use clap::Parser; use clap::Parser;
use std::process::exit; use runner::CapturedOutput;
mod quote; mod quote;
mod runner; mod runner;
mod tap_stream; mod tap_stream;
#[derive(Parser)] #[derive(Parser)]
#[command(version, about)] /// Tool to run a command, capture its output, and send it to ntfy.
struct Cli { struct Cli {
/// URL of the ntfy server and topic, e.g. https://ntfy.sh/topic /// URL of the ntfy server and topic, e.g. https://ntfy.sh/topic
#[arg(short = 'n', long = "ntfy-url", env = "NTFY_URL", alias = "url")] #[arg(short = 'n', long = "ntfy-url", env = "NTFY_URL", alias = "url")]
@ -210,13 +210,7 @@ async fn main() {
}; };
match request.send().await.and_then(|r| r.error_for_status()) { match request.send().await.and_then(|r| r.error_for_status()) {
Ok(_) => exit(match status { Ok(_) => (),
Some(code) => code.code().unwrap_or(255), Err(error) => eprintln!("Failed to send request to ntfy: {}", error),
None => 255,
}),
Err(error) => {
eprintln!("Failed to send request to ntfy: {}", error);
exit(37)
}
} }
} }

View file

@ -1,6 +1,7 @@
use crate::tap_stream::{ReadOrWrite, TapStream}; use crate::tap_stream::{ReadOrWrite, TapStream};
use std::process::{ExitStatus, Stdio}; use std::process::{ExitStatus, Stdio};
use tokio::{io, process::Command, select}; use tokio::process::Command;
use tokio::{io, select};
pub enum CaptureError { pub enum CaptureError {
Spawn(io::Error), Spawn(io::Error),