From b39663bf381cbc1079fed08fbd3d0fe665151e90 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Wed, 9 Sep 2020 13:03:44 +0200 Subject: Rename device path to USB path in list output For consistency with the --usb-path option, this path renames the device path column in the output of the list command to USB path. --- src/commands.rs | 2 +- src/tests/list.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/commands.rs b/src/commands.rs index d352ca2..ebb28ca 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -425,7 +425,7 @@ pub fn list(ctx: &mut Context<'_>, no_connect: bool) -> anyhow::Result<()> { if device_infos.is_empty() { println!(ctx, "No Nitrokey device connected")?; } else { - println!(ctx, "device path\tmodel\tserial number")?; + println!(ctx, "USB path\tmodel\tserial number")?; let mut manager = nitrokey::take().context("Failed to acquire access to Nitrokey device manager")?; diff --git a/src/tests/list.rs b/src/tests/list.rs index 4c28995..cc969c6 100644 --- a/src/tests/list.rs +++ b/src/tests/list.rs @@ -16,7 +16,7 @@ fn not_connected() -> anyhow::Result<()> { #[test_device] fn connected(model: nitrokey::Model) -> anyhow::Result<()> { let re = regex::Regex::new( - r#"^device path\tmodel\tserial number + r#"^USB path\tmodel\tserial number ([[:^space:]]+\t(Pro|Storage|unknown)\t0x[[:xdigit:]]+ )+$"#, ) -- cgit v1.2.3