Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
installer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
installer
Commits
71335925
Verified
Commit
71335925
authored
5 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
0.2.2 - fix cargo doc
parent
f794ab2a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Cargo.lock
+1
-1
1 addition, 1 deletion
Cargo.lock
Cargo.toml
+1
-1
1 addition, 1 deletion
Cargo.toml
src/lib.rs
+8
-5
8 additions, 5 deletions
src/lib.rs
with
10 additions
and
7 deletions
Cargo.lock
+
1
−
1
View file @
71335925
...
...
@@ -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)",
...
...
This diff is collapsed.
Click to expand it.
Cargo.toml
+
1
−
1
View file @
71335925
[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>"
]
...
...
This diff is collapsed.
Click to expand it.
src/lib.rs
+
8
−
5
View file @
71335925
...
...
@@ -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!
(
"
\n
Pass: {:?}; 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
(),
...
...
This diff is collapsed.
Click to expand it.
Mikhail Chystsiakou
@mich
mentioned in merge request
!12 (closed)
·
5 years ago
mentioned in merge request
!12 (closed)
mentioned in merge request !12
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment