PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-11 13:51:01 -05:00
Code Releases Activity

Do not replace $SHELL with --command option

Browse source 
Signed-off-by: Justin Charette <charetjc@gmail.com>
This commit is contained in:
Justin Charette 2017-04-01 19:30:29 -04:00 committed by Joe Wilm
parent 2d1af06c2d
commit 5b079f6d43
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cli.rs
View file

@ -25,7 +25,7 @@ pub struct Options {
pub dimensions: Option<Dimensions>,
pub title: String,
pub log_level: log::LogLevelFilter,
pub shell: Option<Shell<'static>>,
pub command: Option<Shell<'static>>,
}
impl Default for Options {
@ -36,7 +36,7 @@ impl Default for Options {
dimensions: None,
title: DEFAULT_TITLE.to_owned(),
log_level: log::LogLevelFilter::Warn,
shell: None,
command: None,
}
}
}
@ -123,7 +123,7 @@ impl Options {
// Arg::min_values(1) is set.
let command = String::from(args.next().unwrap());
let args = args.map(String::from).collect();
options.shell = Some(Shell::new_with_args(command, args));
options.command = Some(Shell::new_with_args(command, args));
}
options
@ -133,7 +133,7 @@ impl Options {
self.dimensions
}
pub fn shell(&self) -> Option<&Shell> {
self.shell.as_ref()
pub fn command(&self) -> Option<&Shell> {
self.command.as_ref()
}
}

9
src/tty.rs
View file

@ -188,12 +188,13 @@ pub fn new<T: ToWinsize>(config: &Config, options: &Options, size: T) -> Pty {
let (master, slave) = openpty(win.ws_row as _, win.ws_col as _);
let default_shell = &Shell::new(pw.shell);
let shell = options.shell()
.or_else(|| config.shell())
let shell = config.shell()
.unwrap_or(&default_shell);
let mut builder = Command::new(shell.program());
for arg in shell.args() {
let initial_command = options.command().unwrap_or(&shell);
let mut builder = Command::new(initial_command.program());
for arg in initial_command.args() {
builder.arg(arg);
}