0.2.5 - update dependencies and prepare for publishing
This commit is contained in:
Generated
+222
-299
File diff suppressed because it is too large
Load Diff
+11
-11
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "redox_installer"
|
||||
version = "0.2.4"
|
||||
version = "0.2.5"
|
||||
description = "A Redox filesystem builder"
|
||||
license = "MIT"
|
||||
authors = ["Jeremy Soller <jackpot51@gmail.com>"]
|
||||
@@ -20,14 +20,14 @@ path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
arg_parser = "0.1.0"
|
||||
liner = "0.4.4"
|
||||
libc = "0.2.54"
|
||||
failure = "0.1.5"
|
||||
rand = "0.6.5"
|
||||
redox_pkgutils = "0.1.2"
|
||||
redox_liner = "0.5.1"
|
||||
libc = "0.2.66"
|
||||
failure = "0.1.6"
|
||||
rand = "0.7.2"
|
||||
redox_pkgutils = "0.1.5"
|
||||
redoxfs = "0.3.7"
|
||||
rust-argon2 = "0.5"
|
||||
serde = "1.0.91"
|
||||
serde_derive = "1.0.91"
|
||||
termion = "1.5.2"
|
||||
toml = "0.5.0"
|
||||
rust-argon2 = "0.6.0"
|
||||
serde = "1.0.103"
|
||||
serde_derive = "1.0.103"
|
||||
termion = "1.5.4"
|
||||
toml = "0.5.5"
|
||||
|
||||
+6
-2
@@ -32,7 +32,7 @@ const REMOTE: &'static str = "https://static.redox-os.org/pkg";
|
||||
/// by redox_users. If the password is blank, the hash is blank.
|
||||
fn hash_password(password: &str) -> Result<String> {
|
||||
if password != "" {
|
||||
let salt = format!("{:X}", OsRng::new()?.next_u64());
|
||||
let salt = format!("{:X}", OsRng.next_u64());
|
||||
let config = argon2::Config::default();
|
||||
let hash = argon2::hash_encoded(password.as_bytes(), salt.as_bytes(), &config)?;
|
||||
Ok(hash)
|
||||
@@ -45,7 +45,11 @@ fn unwrap_or_prompt<T: FromStr>(option: Option<T>, context: &mut liner::Context,
|
||||
match option {
|
||||
Some(t) => Ok(t),
|
||||
None => {
|
||||
let line = context.read_line(prompt, &mut |_| {})?;
|
||||
let line = context.read_line(
|
||||
prompt,
|
||||
None,
|
||||
&mut liner::BasicCompleter::new(Vec::<String>::new())
|
||||
)?;
|
||||
T::from_str(&line).map_err(|_err| err_msg("failed to parse input"))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user