Archives
/
distant
mirror of https://github.com/chipsenkbeil/distant
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump to v0.15.0-alpha.22 and update distant/ssh handlers to inject exit code 0 when successful

Browse Source
pull/96/head v0.15.0-alpha.22
Chip Senkbeil 3 years ago
parent 1dc5b69236
commit fefcc66737
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File

8
Cargo.lock generated
Unescape Escape View File

@ -427,7 +427,7 @@ dependencies = [
[[package]] [[package]]
name = "distant" name = "distant"
version = "0.15.0-alpha.20" version = "0.15.0-alpha.22"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"assert_fs", "assert_fs",
@ -451,7 +451,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-core" name = "distant-core"
version = "0.15.0-alpha.20" version = "0.15.0-alpha.22"
dependencies = [ dependencies = [
"assert_fs", "assert_fs",
"bytes", "bytes",
@ -476,7 +476,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-lua" name = "distant-lua"
version = "0.15.0-alpha.20" version = "0.15.0-alpha.22"
dependencies = [ dependencies = [
"distant-core", "distant-core",
"distant-ssh2", "distant-ssh2",
@ -510,7 +510,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-ssh2" name = "distant-ssh2"
version = "0.15.0-alpha.20" version = "0.15.0-alpha.22"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"assert_fs", "assert_fs",

6
Cargo.toml
Unescape Escape View File

@ -3,7 +3,7 @@ name = "distant"
description = "Operate on a remote computer through file and process manipulation" description = "Operate on a remote computer through file and process manipulation"
categories = ["command-line-utilities"] categories = ["command-line-utilities"]
keywords = ["cli"] keywords = ["cli"]
version = "0.15.0-alpha.21" version = "0.15.0-alpha.22"
authors = ["Chip Senkbeil <chip@senkbeil.org>"] authors = ["Chip Senkbeil <chip@senkbeil.org>"]
edition = "2018" edition = "2018"
homepage = "https://github.com/chipsenkbeil/distant" homepage = "https://github.com/chipsenkbeil/distant"
@ -25,7 +25,7 @@ ssh2 = ["distant-ssh2"]
[dependencies] [dependencies]
derive_more = { version = "0.99.16", default-features = false, features = ["display", "from", "error", "is_variant"] } derive_more = { version = "0.99.16", default-features = false, features = ["display", "from", "error", "is_variant"] }
distant-core = { version = "=0.15.0-alpha.21", path = "distant-core", features = ["structopt"] } distant-core = { version = "=0.15.0-alpha.22", path = "distant-core", features = ["structopt"] }
flexi_logger = "0.18.0" flexi_logger = "0.18.0"
log = "0.4.14" log = "0.4.14"
once_cell = "1.8.0" once_cell = "1.8.0"
@ -37,7 +37,7 @@ strum = { version = "0.21.0", features = ["derive"] }
whoami = "1.1.2" whoami = "1.1.2"
# Optional native SSH functionality # Optional native SSH functionality
distant-ssh2 = { version = "=0.15.0-alpha.21", path = "distant-ssh2", optional = true } distant-ssh2 = { version = "=0.15.0-alpha.22", path = "distant-ssh2", optional = true }
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
fork = "0.1.18" fork = "0.1.18"

2
distant-core/Cargo.toml
Unescape Escape View File

@ -3,7 +3,7 @@ name = "distant-core"
description = "Core library for distant, enabling operation on a remote computer through file and process manipulation" description = "Core library for distant, enabling operation on a remote computer through file and process manipulation"
categories = ["network-programming"] categories = ["network-programming"]
keywords = ["api", "async"] keywords = ["api", "async"]
version = "0.15.0-alpha.21" version = "0.15.0-alpha.22"
authors = ["Chip Senkbeil <chip@senkbeil.org>"] authors = ["Chip Senkbeil <chip@senkbeil.org>"]
edition = "2018" edition = "2018"
homepage = "https://github.com/chipsenkbeil/distant" homepage = "https://github.com/chipsenkbeil/distant"

9
distant-core/src/server/distant/handler.rs
Unescape Escape View File

@ -578,7 +578,14 @@ where
match status { match status {
Ok(status) => { Ok(status) => {
let success = status.success(); let success = status.success();
let code = status.code(); let mut code = status.code();
// If we succeeded and have no exit code, automatically populate
// with success exit code
if success && code.is_none() {
code = Some(0);
}
let payload = vec![ResponseData::ProcDone { id, success, code }]; let payload = vec![ResponseData::ProcDone { id, success, code }];
if !reply_2(payload).await { if !reply_2(payload).await {
error!( error!(

6
distant-lua/Cargo.toml
Unescape Escape View File

@ -3,7 +3,7 @@ name = "distant-lua"
description = "Lua bindings to the distant Rust crates" description = "Lua bindings to the distant Rust crates"
categories = ["api-bindings", "network-programming"] categories = ["api-bindings", "network-programming"]
keywords = ["api", "async"] keywords = ["api", "async"]
version = "0.15.0-alpha.21" version = "0.15.0-alpha.22"
authors = ["Chip Senkbeil <chip@senkbeil.org>"] authors = ["Chip Senkbeil <chip@senkbeil.org>"]
edition = "2018" edition = "2018"
homepage = "https://github.com/chipsenkbeil/distant" homepage = "https://github.com/chipsenkbeil/distant"
@ -24,8 +24,8 @@ luajit = ["mlua/luajit"]
vendored = ["mlua/vendored"] vendored = ["mlua/vendored"]
[dependencies] [dependencies]
distant-core = { version = "=0.15.0-alpha.21", path = "../distant-core" } distant-core = { version = "=0.15.0-alpha.22", path = "../distant-core" }
distant-ssh2 = { version = "=0.15.0-alpha.21", features = ["serde"], path = "../distant-ssh2" } distant-ssh2 = { version = "=0.15.0-alpha.22", features = ["serde"], path = "../distant-ssh2" }
futures = "0.3.17" futures = "0.3.17"
log = "0.4.14" log = "0.4.14"
mlua = { version = "0.6.6", features = ["async", "macros", "module", "serialize"] } mlua = { version = "0.6.6", features = ["async", "macros", "module", "serialize"] }

4
distant-ssh2/Cargo.toml
Unescape Escape View File

@ -2,7 +2,7 @@
name = "distant-ssh2" name = "distant-ssh2"
description = "Library to enable native ssh-2 protocol for use with distant sessions" description = "Library to enable native ssh-2 protocol for use with distant sessions"
categories = ["network-programming"] categories = ["network-programming"]
version = "0.15.0-alpha.21" version = "0.15.0-alpha.22"
authors = ["Chip Senkbeil <chip@senkbeil.org>"] authors = ["Chip Senkbeil <chip@senkbeil.org>"]
edition = "2018" edition = "2018"
homepage = "https://github.com/chipsenkbeil/distant" homepage = "https://github.com/chipsenkbeil/distant"
@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
[dependencies] [dependencies]
async-compat = "0.2.1" async-compat = "0.2.1"
distant-core = { version = "=0.15.0-alpha.21", path = "../distant-core" } distant-core = { version = "=0.15.0-alpha.22", path = "../distant-core" }
futures = "0.3.16" futures = "0.3.16"
log = "0.4.14" log = "0.4.14"
rand = { version = "0.8.4", features = ["getrandom"] } rand = { version = "0.8.4", features = ["getrandom"] }

2
distant-ssh2/src/handler.rs
Unescape Escape View File

@ -826,7 +826,7 @@ where
let payload = vec![ResponseData::ProcDone { let payload = vec![ResponseData::ProcDone {
id, id,
success: !should_kill && success, success: !should_kill && success,
code: None, code: if success { Some(0) } else { None },
}]; }];
if !reply_2(payload).await { if !reply_2(payload).await {

Write Preview
Loading…
Cancel
Save