Merge pull request #21 from mario-eth/bugfix/cleaning-dependencies-on…

…-custom-url-download

Issue #17

src/dependency_downloader.rs

@@ -93,17 +93,18 @@ pub async fn download_dependency(
     dependency_name: &String,
     dependency_url: &String,
 ) -> Result<(), DownloadError> {
-    let new_path: std::path::PathBuf = get_current_working_dir().unwrap().join("dependencies");
-    if !new_path.is_dir() {
-        fs::create_dir(&new_path).unwrap();
+    let dependency_directory: std::path::PathBuf =
+        get_current_working_dir().unwrap().join("dependencies");
+    if !dependency_directory.is_dir() {
+        fs::create_dir(&dependency_directory).unwrap();
     }
 
     println!(
         "Downloading dependency {} from {}",
         dependency_name, dependency_url
     );
     let download_result: Result<(), tokio_dl_stream_to_disk::error::Error> =
-        AsyncDownload::new(dependency_url, &new_path, dependency_name)
+        AsyncDownload::new(dependency_url, &dependency_directory, dependency_name)
             .download(&None)
             .await;
     if download_result.is_ok() {

src/main.rs

@@ -87,7 +87,7 @@ async fn main() {
                     version: dependency_version.clone(),
                     url: dependency_url.clone(),
                 });
-                if download_dependencies(&dependencies, true).await.is_err() {
+                if download_dependencies(&dependencies, false).await.is_err() {
                     eprintln!("Error downloading dependencies");
                     exit(500);
                 }
@@ -115,6 +115,7 @@ async fn main() {
                     exit(500);
                 }
             }
+
             // TODO this is kinda junky written, need to refactor and a better TOML writer
             config::add_to_config(&dependency_name, &dependency_version, &dependency_url);
 
@@ -125,13 +126,15 @@ async fn main() {
                     exit(500);
                 }
             }
+
             match janitor::cleanup_dependency(&dependency_name, &dependency_version) {
                 Ok(_) => {}
                 Err(err) => {
                     eprintln!("Error cleanup dependency: {:?}", err);
                     exit(500);
                 }
             }
+
             if foundry_setup.remappings {
                 remappings();
             }