Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
installer
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
6
Issues
6
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
redox-os
installer
Commits
961983e7
Commit
961983e7
authored
Jan 09, 2017
by
Jeremy Soller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup prompt macros
parent
f666d064
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
example.toml
config/example.toml
+5
-1
install.rs
src/install.rs
+3
-11
No files found.
config/example.toml
View file @
961983e7
...
...
@@ -3,7 +3,7 @@
# General settings
[general]
# Prompt if settings are not defined
prompt
=
tru
e
prompt
=
fals
e
# Package settings
[packages]
...
...
@@ -11,7 +11,11 @@ orbutils = {}
# User settings
[users.root]
password
=
"$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk"
uid
=
0
gid
=
0
name
=
"root"
home
=
"/root"
[users.user]
password
=
""
src/install.rs
View file @
961983e7
...
...
@@ -63,14 +63,6 @@ pub fn install(config: Config) -> Result<(), String> {
let
mut
context
=
liner
::
Context
::
new
();
macro_rules!
prompt
{
(
$dst:expr
,
$
(
$arg:tt
)
*
)
=>
(
if
config
.general.prompt
{
unwrap_or_prompt
(
$dst
,
&
mut
context
,
&
format!
(
$
(
$arg
)
*
))
}
else
{
Ok
(
$dst
.unwrap_or_default
())
})
}
macro_rules!
prompt_default
{
(
$dst:expr
,
$def:expr
,
$
(
$arg:tt
)
*
)
=>
(
if
config
.general.prompt
{
match
unwrap_or_prompt
(
$dst
,
&
mut
context
,
&
format!
(
$
(
$arg
)
*
))
{
Ok
(
res
)
=>
if
res
.is_empty
()
{
...
...
@@ -105,9 +97,9 @@ pub fn install(config: Config) -> Result<(), String> {
let
gid
=
user
.gid
.unwrap_or
(
uid
);
let
name
=
prompt
_default!
(
user
.name
,
username
.clone
(),
"{}: name: "
,
username
)
?
;
let
home
=
prompt
_default!
(
user
.home
,
format!
(
"/home/{}"
,
username
),
"{}: home: "
,
username
)
?
;
let
shell
=
prompt
_default!
(
user
.shell
,
"/bin/ion"
.to_string
(),
"{}: shell
: "
,
username
)
?
;
let
name
=
prompt
!
(
user
.name
,
username
.clone
(),
"{}: name [{}]: "
,
username
,
username
)
?
;
let
home
=
prompt
!
(
user
.home
,
format!
(
"/home/{}"
,
username
),
"{}: home [/home/{}]: "
,
username
,
username
)
?
;
let
shell
=
prompt
!
(
user
.shell
,
"/bin/ion"
.to_string
(),
"{}: shell [/bin/ion]
: "
,
username
)
?
;
println!
(
"Creating user {}:"
,
username
);
println!
(
"
\t
Password: {}"
,
password
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment