From f606b9d99419704cd9b9eda8b83cdc8a7b54b9e1 Mon Sep 17 00:00:00 2001 From: tensor-programming Date: Tue, 6 Aug 2019 03:14:19 -0400 Subject: [PATCH] change Wix install path to something more realistic. --- tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs b/tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs index 99ca787c4..b20e37ff8 100644 --- a/tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs +++ b/tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs @@ -84,7 +84,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { // Copy resource files into package: let mut resources = collect_resource_info(settings).chain_err(|| "Failed to collect resource file information")?; - let directories = collect_directory_info(settings, &mut resources) + let _directories = collect_directory_info(settings, &mut resources) .chain_err(|| "Failed to collect resource directory information")?; let cabinets = divide_resources_into_cabinets(resources); generate_resource_cabinets(&mut package, &cabinets) @@ -94,7 +94,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { let drain = std::sync::Mutex::new(drain).fuse(); let logger = slog::Logger::root(drain, o!()); - wix::get_and_extract_wix(&logger, &dirs::home_dir().unwrap()); + wix::get_and_extract_wix(&logger, &PathBuf::from("./WixTools")); // Set up installer database tables: // create_directory_table(&mut package, &directories)