Fixed the situation where using an alias inside a hotkey
This commit is contained in:
parent
c532c1a331
commit
809a7e5f71
14
src/lib.rs
14
src/lib.rs
@ -532,15 +532,16 @@ pub mod shell {
|
|||||||
let hotcmd = &conf.hotkeys[&x].clone();
|
let hotcmd = &conf.hotkeys[&x].clone();
|
||||||
for c in hotcmd.chars() {
|
for c in hotcmd.chars() {
|
||||||
if c != '\n' {
|
if c != '\n' {
|
||||||
write_letter(&mut mycommand,
|
write_letter(&mut mycommand,
|
||||||
&mut current_pos,
|
&mut current_pos,
|
||||||
&mut max_pos,
|
&mut max_pos,
|
||||||
c);
|
c);
|
||||||
} else {
|
} else {
|
||||||
current_pos = 0;
|
current_pos = 0;
|
||||||
max_pos = 0;
|
max_pos = 0;
|
||||||
|
mycommand = transform_alias(&conf, mycommand);
|
||||||
run_cmd(&mut mycommand,
|
run_cmd(&mut mycommand,
|
||||||
&mut current_number,
|
&mut current_number,
|
||||||
&mut conf,
|
&mut conf,
|
||||||
&mut stdout);
|
&mut stdout);
|
||||||
}
|
}
|
||||||
@ -552,8 +553,9 @@ pub mod shell {
|
|||||||
append_prev_arg(&mut mycommand, &mut current_pos, &mut max_pos);
|
append_prev_arg(&mut mycommand, &mut current_pos, &mut max_pos);
|
||||||
},
|
},
|
||||||
'!' => {
|
'!' => {
|
||||||
let mut cmd = format!("echo -- ALIASES --> {:?}", conf.hotkeys);
|
let mut cmd = format!("\r\n-- ALIASES --> \r\n{:?}\r\n", conf.hotkeys);
|
||||||
run_cmd(&mut cmd, &mut current_number, &mut conf, &mut stdout);
|
cmd = cmd.replace(",", "\r\n");
|
||||||
|
write!(stdout, "{}", cmd);
|
||||||
},
|
},
|
||||||
|
|
||||||
_ => (),
|
_ => (),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user