wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 13:21:38 +03:00
Code Issues Projects Releases Wiki Activity

clap -> structopt

Browse Source 
This looks like it will help with some enum parsing
This commit is contained in:
Wez Furlong 2019-02-20 07:54:31 -08:00
parent 50a882874a
commit b0c2704118
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -6,7 +6,6 @@ edition = "2018"
[dependencies]
bitflags = "~1.0"
clap = "~2.32"
euclid = "~0.19"
failure = "~0.1"
failure_derive = "~0.1"
@ -25,6 +24,7 @@ clipboard = "0.5"
unicode-normalization = "~0.1"
freetype = "~0.4"
open = "1.2"
structopt = "0.2"
[target.'cfg(unix)'.dependencies]
harfbuzz-sys = "~0.3"

51
src/main.rs
View File

@ -6,9 +6,9 @@ extern crate failure_derive;
extern crate serde_derive;
#[macro_use]
pub mod log;
use clap::{App, Arg};
use failure::Error;
use std::ffi::OsString;
use structopt::StructOpt;
#[cfg(all(unix, not(feature = "force-glutin"), not(target_os = "macos")))]
mod xwindows;
@ -62,26 +62,27 @@ fn get_shell() -> Result<String, Error> {
// terminal.advance_bytes(message);
// !=
#[derive(Debug, StructOpt)]
#[structopt(
name = "wezterm",
about = "Wez's Terminal Emulator\nhttp://github.com/wez/wezterm"
)]
#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
struct Opt {
/// Skip loading ~/.wezterm.toml
#[structopt(short = "n")]
skip_config: bool,
/// Instead of executing your shell, run PROG.
/// For example: `wezterm -- bash -l` will spawn bash
/// as if it were a login shell.
#[structopt(parse(from_os_str))]
prog: Vec<OsString>,
}
fn main() -> Result<(), Error> {
let args = App::new("wezterm")
.version("0.1")
.author("Wez Furlong <wez@wezfurlong.org>")
.about(
"Wez's Terminal Emulator\n\
http://github.com/wez/wezterm",
)
.arg(
Arg::with_name("SKIP_CONFIG")
.short("n")
.help("Skip loading ~/.wezterm.toml"),
)
.arg(Arg::with_name("PROG").multiple(true).help(
"Instead of executing your shell, run PROG. \
For example: `wezterm -- bash -l` will spawn bash \
as if it were a login shell.",
))
.get_matches();
let config = Rc::new(if args.is_present("SKIP_CONFIG") {
let opts = Opt::from_args();
let config = Rc::new(if opts.skip_config {
config::Config::default_config()
} else {
config::Config::load()?
@ -90,12 +91,8 @@ fn main() -> Result<(), Error> {
let fontconfig = Rc::new(FontConfiguration::new(Rc::clone(&config)));
let cmd = if args.is_present("PROG") {
Some(
args.values_of_os("PROG")
.expect("PROG wasn't present after all!?")
.collect(),
)
let cmd = if opts.prog.len() > 0 {
Some(opts.prog.iter().map(|x| x.as_os_str()).collect())
} else {
None
};