Merge pull request #13 from parkerokonek/windows

Windows

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "paradoxmerger"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Parker Okonek <parkerokonek@gmail.com>"]
 edition = "2018"
 

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")

src/lib.rs

@@ -226,7 +226,7 @@ fn generate_single_mod(mod_path: &Path, mod_file: &Path) -> Option<ModInfo> {
 pub fn generate_mod_list(path: &Path) -> Vec<ModInfo> {
         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.");

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.");
-    }
 }