Merge pull request #66 from t-mw/patch-2

Apply windows exe suffix to bin_name on s3 backend

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [unreleased]
 ### Added
 ### Changed
+- `UpdateBuilder.bin_name` will add the platform-specific exe suffix on the S3 backend.
 ### Removed
 
 ## [0.23.0]

src/backends/s3.rs

@@ -12,7 +12,7 @@ use quick_xml::events::Event;
 use quick_xml::Reader;
 use regex::Regex;
 use std::cmp::Ordering;
-use std::env;
+use std::env::{self, consts::EXE_SUFFIX};
 use std::path::{Path, PathBuf};
 
 /// Maximum number of items to retrieve from S3 API
@@ -237,9 +237,10 @@ impl UpdateBuilder {
 
     /// Set the exe's name. Also sets `bin_path_in_archive` if it hasn't already been set.
     pub fn bin_name(&mut self, name: &str) -> &mut Self {
-        self.bin_name = Some(name.to_owned());
+        let raw_bin_name = format!("{}{}", name.trim_end_matches(EXE_SUFFIX), EXE_SUFFIX);
+        self.bin_name = Some(raw_bin_name.clone());
         if self.bin_path_in_archive.is_none() {
-            self.bin_path_in_archive = Some(PathBuf::from(name));
+            self.bin_path_in_archive = Some(PathBuf::from(raw_bin_name));
         }
         self
     }