fix stuff in packages

Author: cyteon

lang/.gitignore

@@ -21,4 +21,7 @@ Cargo.lock
 #.idea/
 
 # Modu
-.modu/
+.modu/
+
+# Other
+tmp

lang/examples/library/project.toml

@@ -1,4 +1,4 @@
 [package]
 name = "test"
-version = "2.0.5"
+version = "2.0.7"
 description = "A package im using to test the package system, this is not a package for units tests or shit"

lang/examples/library/tests/equals.modu

@@ -0,0 +1,7 @@
+fn equals(a,b) {
+    if a == b {
+        return true;
+    }
+
+    return false;
+}

lang/src/cli/install.rs

@@ -37,9 +37,30 @@ fn install_package(name: &str, version: &str) -> Result<serde_json::Value, Strin
         let mut file = archive.by_index(i).unwrap();
         let path = ".modu/packages/".to_string() + name + "/" + file.name();
 
-        if file.name().ends_with("/") {
-            std::fs::create_dir_all(path).unwrap();
+        if file.name().contains("/") || file.name().contains("\\") {
+            if file.name().contains("/") {
+                let mut path = path.split("/").collect::<Vec<&str>>();
+                path.pop();
+
+                std::fs::create_dir_all(path.join("/")).unwrap();
+            } else {
+                let mut path = path.split("\\").collect::<Vec<&str>>();
+                path.pop();
+
+                std::fs::create_dir_all(path.join("\\")).unwrap();
+            }
+
+
+            let mut out = std::fs::File::create(".modu/packages/".to_string() + name + "/" + file.name()).unwrap();
+            std::io::copy(&mut file, &mut out).unwrap();
+            
         } else {
+            #[cfg(windows)]
+            let path = path.replace("/", "\\");
+            
+            #[cfg(not(windows))]
+            let path = path.replace("\\", "/");
+
             let mut out = std::fs::File::create(path).unwrap();
             std::io::copy(&mut file, &mut out).unwrap();
         }

lang/src/cli/publish.rs

@@ -4,7 +4,7 @@ use toml;
 use zip;
 use serde_json::json;
 
-static BLOCKLIST: [&str; 3] = [".git", ".gitignore", ".modu"];
+static BLOCKLIST: [&str; 4] = [".git", ".gitignore", ".modu", ".github"];
 
 fn read_dir(dir: &std::path::Path, archive: &mut zip::ZipWriter<std::fs::File>) {
     for entry in std::fs::read_dir(dir).unwrap() {
@@ -14,7 +14,7 @@ fn read_dir(dir: &std::path::Path, archive: &mut zip::ZipWriter<std::fs::File>)
         let mut do_break = false;
 
         for item in BLOCKLIST.iter() {
-            if path.to_str().unwrap().replace("./", "") == *item {
+            if path.to_str().unwrap().replace("\\", "/") == format!("./{}", item) {
                 println!("Ignoring {}", path.to_str().unwrap());
                 do_break = true;
             }
@@ -33,7 +33,7 @@ fn read_dir(dir: &std::path::Path, archive: &mut zip::ZipWriter<std::fs::File>)
                 file.read_to_string(&mut gitignore_content).unwrap();
 
                 for line in gitignore_content.lines() {
-                    if path.to_str().unwrap().replace("./", "") == line {
+                    if path.to_str().unwrap().replace("\\", "/") == format!("./{}", line) {
                         println!("Ignoring {}", path.to_str().unwrap());
                         do_break = true;
                     }