From e78ea13be9aefe6d606cca57a1ecde90344cac8c Mon Sep 17 00:00:00 2001 From: Parker Okonek Date: Thu, 6 Aug 2020 17:20:15 -0700 Subject: [PATCH 1/2] Now runs properly on Windows --- src/lib.rs | 2 +- src/merge_diff.rs | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 6bef7e0..710f8a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -226,7 +226,7 @@ fn generate_single_mod(mod_path: &Path, mod_file: &Path) -> Option { pub fn generate_mod_list(path: &Path) -> Vec { let mod_reg = Regex::new("\"mod/[^\"]*\"").unwrap(); let mut settings = path.to_path_buf(); - settings.push("./settings.txt"); + settings.push("settings.txt"); let enabled_mods = fgrep(&settings,&mod_reg,true); if enabled_mods.is_empty() { eprintln!("Had an issue reading the settings file."); diff --git a/src/merge_diff.rs b/src/merge_diff.rs index 77f8c1c..0180fd7 100644 --- a/src/merge_diff.rs +++ b/src/merge_diff.rs @@ -225,13 +225,4 @@ mod test { assert_eq!(diff_single_conflict(source, &[change_line,remove_line], false),None,"If one file tries to remove a line and another wants to change it, these are not compatible changes"); } - - //#[test] - fn test_real_files() { - let source = include_str!("test/vanilla_religions.txt"); - let slavic = include_str!("test/slavic_religions.txt").to_owned(); - let immersive = include_str!("test/immersive_religions.txt").to_owned(); - - assert_ne!(diff_single_conflict(source, &[slavic,immersive], true),None,"These files do not have any unreconcilable conflicts."); - } } \ No newline at end of file From 629a532a956378697300ce47db4255bb7122ad11 Mon Sep 17 00:00:00 2001 From: Parker Okonek Date: Thu, 6 Aug 2020 17:28:46 -0700 Subject: [PATCH 2/2] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/bin/merger-cli.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76fb3d9..6cd25b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "paradoxmerger" -version = "0.1.0" +version = "0.3.0" dependencies = [ "clap", "diff_match_patch", diff --git a/Cargo.toml b/Cargo.toml index f7a2b59..618141e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "paradoxmerger" -version = "0.1.0" +version = "0.3.0" authors = ["Parker Okonek "] edition = "2018" diff --git a/src/bin/merger-cli.rs b/src/bin/merger-cli.rs index ca4fe1f..5b92df5 100644 --- a/src/bin/merger-cli.rs +++ b/src/bin/merger-cli.rs @@ -46,7 +46,7 @@ fn main() { pub fn parse_args() -> ArgOptions { let args = App::new("Parker's Paradox Patcher") - .version("0.2") + .version("0.3") .about("Merges some mods together automatically sometimes.") .author("Parker Okonek") .arg(Arg::with_name("config")