From 160a793017d89d875c7bcb4ce79db5c0e1fb461c Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Tue, 25 Apr 2017 21:57:04 -0700
Subject: [PATCH] Update for pkgutils refactoring

---
 src/install.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/install.rs b/src/install.rs
index 30c8c5d8b7..106d950695 100644
--- a/src/install.rs
+++ b/src/install.rs
@@ -6,7 +6,7 @@ extern crate userutils;
 
 use self::rand::Rng;
 use self::termion::input::TermRead;
-use self::pkgutils::Repo;
+use self::pkgutils::{Repo, Package};
 
 use std::{env, fs};
 use std::io::{self, stderr, Write};
@@ -67,7 +67,6 @@ fn prompt_password(prompt: &str, confirm_prompt: &str) -> Result<String, String>
 fn install_packages(config: &Config, dest: &str, cookbook: Option<&str>) {
     let mut repo = Repo::new(TARGET);
     repo.add_remote(REMOTE);
-    repo.set_dest(dest);
 
     if let Some(cookbook) = cookbook {
         let status = Command::new("./update-packages.sh")
@@ -87,12 +86,12 @@ fn install_packages(config: &Config, dest: &str, cookbook: Option<&str>) {
             let path = format!("{}/{}/repo/{}/{}.tar",
                                env::current_dir().unwrap().to_string_lossy(),
                                cookbook, TARGET, packagename);
-            repo.install_file(&path).unwrap();
+            Package::from_path(&path).unwrap().install(dest).unwrap();
         }
     } else {
         for (packagename, _package) in &config.packages {
             println!("Installing package {}", packagename);
-            repo.install(&packagename).unwrap();
+            repo.fetch(&packagename).unwrap().install(dest).unwrap();
         }
     }
 }