1
0
mirror of https://github.com/sharkdp/bat synced 2026-08-03 18:51:44 +00:00

Add BAT_OPTS environment variable

This commit is contained in:
sharkdp
2018-10-11 23:01:19 +02:00
committed by David Peter
parent 866b9e16a8
commit 5bff4548be
2 changed files with 8 additions and 3 deletions
+4 -3
View File
@@ -15,7 +15,7 @@ use console::Term;
use ansi_term;
use assets::BAT_THEME_DEFAULT;
use config::get_args_from_config_file;
use config::{get_args_from_config_file, get_args_from_env_var};
use errors::*;
use inputfile::InputFile;
use line_range::LineRange;
@@ -104,8 +104,9 @@ impl App {
let mut cli_args = wild::args_os();
// Read arguments from bats config file
let mut args =
get_args_from_config_file().chain_err(|| "Could not parse configuration file")?;
let mut args = get_args_from_env_var()
.unwrap_or_else(|| get_args_from_config_file())
.chain_err(|| "Could not parse configuration file")?;
// Put the zero-th CLI argument (program name) first
args.insert(0, cli_args.next().unwrap());