fix: properly append additional extention to path

crates/packager/src/lib.rs

@@ -100,6 +100,7 @@ pub use error::{Error, Result};
 pub use sign::SigningConfig;
 
 pub use package::{package, PackageOuput};
+use util::PathExt;
 
 fn parse_log_level(verbose: u8) -> tracing::Level {
     match verbose {
@@ -145,13 +146,7 @@ pub fn sign_outputs(
     for package in packages {
         for path in &package.paths.clone() {
             let path = if path.is_dir() {
-                let extension = path.extension().unwrap_or_default().to_string_lossy();
-                let extension = format!(
-                    "{}{}tar.gz",
-                    extension,
-                    if extension.is_empty() { "" } else { "." }
-                );
-                let zip = path.with_extension(extension);
+                let zip = path.with_additional_extension("tar.gz");
                 let dest_file = util::create_file(&zip)?;
                 let gzip_encoder = libflate::gzip::Encoder::new(dest_file)?;
                 let writer = util::create_tar_from_dir(path, gzip_encoder)?;

crates/packager/src/package/deb/mod.rs

@@ -20,7 +20,10 @@ use serde::Serialize;
 use walkdir::WalkDir;
 
 use super::Context;
-use crate::{config::Config, util};
+use crate::{
+    config::Config,
+    util::{self, PathExt},
+};
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub struct DebIcon {
@@ -318,7 +321,7 @@ fn generate_md5sums(control_dir: &Path, data_dir: &Path) -> crate::Result<()> {
 /// directory and returns the path to the new file.
 fn tar_and_gzip_dir<P: AsRef<Path>>(src_dir: P) -> crate::Result<PathBuf> {
     let src_dir = src_dir.as_ref();
-    let dest_path = src_dir.with_extension("tar.gz");
+    let dest_path = src_dir.with_additional_extension("tar.gz");
     let dest_file = util::create_file(&dest_path)?;
     let gzip_encoder = libflate::gzip::Encoder::new(dest_file)?;
     let gzip_encoder = create_tar_from_dir(src_dir, gzip_encoder)?;

crates/packager/src/sign.rs

@@ -18,7 +18,7 @@ use base64::{engine::general_purpose::STANDARD, Engine};
 use minisign::{sign, KeyPair as KP, SecretKey, SecretKeyBox};
 use serde::{Deserialize, Serialize};
 
-use crate::util;
+use crate::util::{self, PathExt};
 
 /// A public and secret key pair.
 #[derive(Clone, Debug)]
@@ -148,8 +148,7 @@ pub fn sign_file_with_secret_key<P: AsRef<Path> + Debug>(
     path: P,
 ) -> crate::Result<PathBuf> {
     let path = path.as_ref();
-    let extension = path.extension().unwrap_or_default().to_string_lossy();
-    let signature_path = path.with_extension(format!("{}.sig", extension));
+    let signature_path = path.with_additional_extension("sig");
     let signature_path = dunce::simplified(&signature_path);
 
     let mut signature_box_writer = util::create_file(signature_path)?;

crates/packager/src/util.rs

@@ -6,6 +6,7 @@
 
 use sha2::Digest;
 use std::{
+    ffi::OsStr,
     fs::File,
     io::{Cursor, Read, Write},
     path::{Path, PathBuf},
@@ -48,6 +49,16 @@ pub fn create_clean_dir<P: AsRef<Path>>(path: P) -> std::io::Result<()> {
     std::fs::create_dir_all(path)
 }
 
+/// Creates a new file at the given path, creating any parent directories as needed.
+#[inline]
+pub(crate) fn create_file(path: &Path) -> crate::Result<std::io::BufWriter<File>> {
+    if let Some(parent) = path.parent() {
+        std::fs::create_dir_all(parent)?;
+    }
+    let file = File::create(path)?;
+    Ok(std::io::BufWriter::new(file))
+}
+
 #[derive(Debug, PartialEq, Eq)]
 struct RustCfg {
     target_arch: Option<String>,
@@ -261,16 +272,6 @@ pub(crate) fn is_retina<P: AsRef<Path>>(path: P) -> bool {
         .unwrap_or(false)
 }
 
-/// Creates a new file at the given path, creating any parent directories as needed.
-#[inline]
-pub(crate) fn create_file(path: &Path) -> crate::Result<std::io::BufWriter<File>> {
-    if let Some(parent) = path.parent() {
-        std::fs::create_dir_all(parent)?;
-    }
-    let file = File::create(path)?;
-    Ok(std::io::BufWriter::new(file))
-}
-
 // Given a list of icon files, try to produce an ICNS file in the out_dir
 // and return the path to it.  Returns `Ok(None)` if no usable icons
 // were provided.
@@ -409,3 +410,41 @@ pub fn create_tar_from_dir<P: AsRef<Path>, W: Write>(src_dir: P, dest_file: W) -
     builder.append_dir_all(filename, src_dir)?;
     builder.into_inner().map_err(Into::into)
 }
+
+pub trait PathExt {
+    fn with_additional_extension(&self, extension: impl AsRef<OsStr>) -> PathBuf;
+}
+
+impl PathExt for Path {
+    fn with_additional_extension(&self, extension: impl AsRef<OsStr>) -> PathBuf {
+        match self.extension() {
+            Some(ext) => {
+                let mut e = ext.to_os_string();
+                e.push(".");
+                e.push(extension);
+                self.with_extension(e)
+            }
+            None => self.with_extension(extension),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_appends_ext() {
+        // Something that has an extention getting another suffix.
+        assert_eq!(
+            PathBuf::from("./asset.zip").with_additional_extension("sig"),
+            PathBuf::from("./asset.zip.sig")
+        );
+
+        // Something that doesn't have an extention, setting its extension.
+        assert_eq!(
+            PathBuf::from("./executable").with_additional_extension("sig"),
+            PathBuf::from("./executable.sig")
+        )
+    }
+}