Verified Commit 71335925 authored by Jeremy Soller's avatar Jeremy Soller

0.2.2 - fix cargo doc

parent f794ab2a
......@@ -477,7 +477,7 @@ dependencies = [
[[package]]
name = "redox_installer"
version = "0.2.1"
version = "0.2.2"
dependencies = [
"arg_parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
......
[package]
name = "redox_installer"
version = "0.2.1"
version = "0.2.2"
description = "A Redox filesystem builder"
license = "MIT"
authors = ["Jeremy Soller <jackpot51@gmail.com>"]
......
......@@ -74,8 +74,6 @@ fn prompt_password(prompt: &str, confirm_prompt: &str) -> Result<String> {
print!("\n{}", confirm_prompt);
let confirm_password = stdin.read_passwd(&mut stdout)?;
// TODO: Remove this debug msg
println!("\nPass: {:?}; ConfPass: {:?};", password, confirm_password);
// Note: Actually comparing two Option<String> values
if confirm_password == password {
......@@ -86,7 +84,12 @@ fn prompt_password(prompt: &str, confirm_prompt: &str) -> Result<String> {
}
fn install_packages<S: AsRef<str>>(config: &Config, dest: &str, cookbook: Option<S>) {
let target = &env::var("TARGET").unwrap_or(env!("TARGET").to_string());
let target = &env::var("TARGET").unwrap_or(
option_env!("TARGET").map_or(
"x86_64-unknown-redox".to_string(),
|x| x.to_string()
)
);
let mut repo = Repo::new(target);
repo.add_remote(REMOTE);
......@@ -122,7 +125,7 @@ fn install_packages<S: AsRef<str>>(config: &Config, dest: &str, cookbook: Option
pub fn install<P: AsRef<Path>, S: AsRef<str>>(config: Config, output_dir: P, cookbook: Option<S>) -> Result<()> {
let mut context = liner::Context::new();
macro_rules! prompt {
($dst:expr, $def:expr, $($arg:tt)*) => (if config.general.prompt {
match unwrap_or_prompt($dst, &mut context, &format!($($arg)*)) {
......@@ -215,7 +218,7 @@ pub fn install<P: AsRef<Path>, S: AsRef<str>>(config: Config, output_dir: P, coo
gid: None
}.create(&output_dir)?;
}
if !shadow.is_empty() {
FileConfig {
path: "/etc/shadow".to_string(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment