mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(users/Profpatsch/lib): add eprint-stdin-netencode

Browse source 
Like `eprint-stdin`, but reads stdin as netencode and pretty-prints it
to stderr.

Change-Id: I430c010b0cac45f077cde9dadfd79adfa7a53eca
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2533
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
This commit is contained in:
Profpatsch 2021-02-14 16:55:56 +01:00
parent 5ca71308a8
commit c98dd8b352
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
users/Profpatsch/lib.nix
View file

@ -21,6 +21,19 @@ let
"pipeline" [ bins.multitee "0-1,2" ] "$@" "pipeline" [ bins.multitee "0-1,2" ] "$@"
]; ];
eprint-stdin-netencode = depot.nix.writeExecline "eprint-stdin-netencode" {} [
"pipeline" [
# move stdout to 3
"fdmove" "3" "1"
# the multitee copies stdin to 1 (the other pipeline end) and 3 (the stdout of the outer pipeline block)
"pipeline" [ bins.multitee "0-1,3" ]
# make stderr the stdout of pretty, merging with the stderr of pretty
"fdmove" "-c" "1" "2"
depot.users.Profpatsch.netencode.pretty
]
"$@"
];
eprintenv = depot.nix.writeExecline "eprintenv" { readNArgs = 1; } [ eprintenv = depot.nix.writeExecline "eprintenv" { readNArgs = 1; } [
"ifelse" [ "fdmove" "-c" "1" "2" bins.printenv "$1" ] "ifelse" [ "fdmove" "-c" "1" "2" bins.printenv "$1" ]
[ "$@" ] [ "$@" ]
@ -43,6 +56,7 @@ in {
debugExec debugExec
eprintf eprintf
eprint-stdin eprint-stdin
eprint-stdin-netencode
eprintenv eprintenv
runInEmptyEnv runInEmptyEnv
; ;

6
users/Profpatsch/netencode/default.nix
View file

@ -38,12 +38,12 @@ let
extern crate exec_helpers; extern crate exec_helpers;
fn main() { fn main() {
let (_, prog) = exec_helpers::args_for_exec("eprint-stdin-netencode", 0); let (_, prog) = exec_helpers::args_for_exec("netencode-pretty", 0);
let mut buf = vec![]; let mut buf = vec![];
let u = netencode::u_from_stdin_or_die_user_error("eprint-stdin-netencode", &mut buf); let u = netencode::u_from_stdin_or_die_user_error("netencode-pretty", &mut buf);
match netencode_pretty::Pretty::from_u(u).print_multiline(&mut std::io::stdout()) { match netencode_pretty::Pretty::from_u(u).print_multiline(&mut std::io::stdout()) {
Ok(()) => {}, Ok(()) => {},
Err(err) => exec_helpers::die_temporary("eprint-stdin-netencode", format!("could not write to stdout: {}", err)) Err(err) => exec_helpers::die_temporary("netencode-pretty", format!("could not write to stdout: {}", err))
} }
} }
''; '';