From 675dd4faf6f56bf6ffbdc72b5826803768fc88d2 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Wed, 12 Jul 2023 15:15:25 +0200
Subject: [PATCH] feat(renew): display seconds

---
 common/src/renew.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/renew.rs b/common/src/renew.rs
index 8e23e79..96cb593 100644
--- a/common/src/renew.rs
+++ b/common/src/renew.rs
@@ -33,7 +33,7 @@ pub fn renew_command(cert: &Certificate, ca_path: &str, file_name: Option<&str>)
         .join(" ");
     let opts = opts.trim();
     let renew_command = format!(
-        "ssh-keygen -s {ca_path} {host_key} -I {} -n {} -z {} -V {:#x}:{:#x} {opts} {}",
+        "ssh-keygen -s {ca_path} {host_key} -I {} -n {} -z {} -V {}:{} {opts} {}",
         escape(cert.key_id().into()),
         escape(cert.valid_principals().join(",").into()),
         cert.serial() + 1,
@@ -41,7 +41,7 @@ pub fn renew_command(cert: &Certificate, ca_path: &str, file_name: Option<&str>)
         expiry_date.as_secs(),
         escape(
             file_name
-                .map(Cow::Borrowed)
+                .map(|name| name.trim_end_matches("-cert.pub")).map(Cow::Borrowed)
                 .unwrap_or_else(|| escape(format!("{}.pub", cert.key_id()).into()))
         )
     );