fix automated build errors on setup command (#711)
- handle opts before client os input setup
This commit is contained in:
parent
829ff953e1
commit
789005d66a
1 changed files with 8 additions and 16 deletions
24
src/main.rs
24
src/main.rs
|
|
@ -36,6 +36,14 @@ pub fn main() {
|
||||||
};
|
};
|
||||||
start_server(Box::new(os_input), path);
|
start_server(Box::new(os_input), path);
|
||||||
} else {
|
} else {
|
||||||
|
let (config, layout, config_options) = match Setup::from_options(&opts) {
|
||||||
|
Ok(results) => results,
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("{}", e);
|
||||||
|
process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let os_input = match get_client_os_input() {
|
let os_input = match get_client_os_input() {
|
||||||
Ok(os_input) => os_input,
|
Ok(os_input) => os_input,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
|
@ -54,14 +62,6 @@ pub fn main() {
|
||||||
session_name = Some(get_active_session());
|
session_name = Some(get_active_session());
|
||||||
}
|
}
|
||||||
|
|
||||||
let (config, _, config_options) = match Setup::from_options(&opts) {
|
|
||||||
Ok(results) => results,
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!("{}", e);
|
|
||||||
process::exit(1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
start_client(
|
start_client(
|
||||||
Box::new(os_input),
|
Box::new(os_input),
|
||||||
opts,
|
opts,
|
||||||
|
|
@ -70,14 +70,6 @@ pub fn main() {
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
let (config, layout, _) = match Setup::from_options(&opts) {
|
|
||||||
Ok(results) => results,
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!("{}", e);
|
|
||||||
process::exit(1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let session_name = opts
|
let session_name = opts
|
||||||
.session
|
.session
|
||||||
.clone()
|
.clone()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue