Skip to content

Commit

Permalink
Merge branch 'main' into tui_for_top
Browse files Browse the repository at this point in the history
  • Loading branch information
Krysztal112233 authored Jan 18, 2025
2 parents e521d10 + eaf0ae2 commit cc58b7f
Show file tree
Hide file tree
Showing 10 changed files with 649 additions and 67 deletions.
150 changes: 113 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ feat_common_core = [
"pwdx",
"slabtop",
"snice",
"pkill",
"top",
"w",
"watch",
Expand All @@ -59,7 +60,7 @@ textwrap = { version = "0.16.1", features = ["terminal_size"] }
thiserror = "2.0.4"
uucore = "0.0.28"
walkdir = "2.5.0"
windows = { version = "0.58.0" }
windows = { version = "0.59.0" }
xattr = "1.3.1"
ratatui = "0.26.1"
crossterm = "0.28.1"
Expand All @@ -84,6 +85,7 @@ ps = { optional = true, version = "0.0.1", package = "uu_ps", path = "src/uu/ps"
pwdx = { optional = true, version = "0.0.1", package = "uu_pwdx", path = "src/uu/pwdx" }
slabtop = { optional = true, version = "0.0.1", package = "uu_slabtop", path = "src/uu/slabtop" }
snice = { optional = true, version = "0.0.1", package = "uu_snice", path = "src/uu/snice" }
pkill = { optional = true, version = "0.0.1", package = "uu_pkill", path = "src/uu/pkill" }
top = { optional = true, version = "0.0.1", package = "uu_top", path = "src/uu/top" }
w = { optional = true, version = "0.0.1", package = "uu_w", path = "src/uu/w" }
watch = { optional = true, version = "0.0.1", package = "uu_watch", path = "src/uu/watch" }
Expand Down
29 changes: 29 additions & 0 deletions src/uu/pkill/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[package]
name = "uu_pkill"
version = "0.0.1"
edition = "2021"
authors = ["uutils developers"]
license = "MIT"
description = "pgrep ~ (uutils) Kills processes based on name and other attributes."

homepage = "https://github.com/uutils/procps"
repository = "https://github.com/uutils/procps/tree/main/src/uu/pkill"
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
categories = ["command-line-utilities"]


[dependencies]
uucore = { workspace = true }
clap = { workspace = true }
walkdir = { workspace = true }
regex = { workspace = true }
nix = { workspace = true, features = ["signal"] }

uu_pgrep = { path = "../pgrep" }

[lib]
path = "src/pkill.rs"

[[bin]]
name = "pkill"
path = "src/main.rs"
Loading

0 comments on commit cc58b7f

Please sign in to comment.