Compare commits

...

2 Commits

Author SHA1 Message Date
Justine Pelletreau
a24680debc Merge branch 'main' of https://gitea.squi.fr/Rust/sqish 2023-02-21 17:26:30 +01:00
Justine Pelletreau
809a7e5f71 Fixed the situation where using an alias inside a hotkey 2023-02-21 17:26:04 +01:00

View File

@ -532,15 +532,16 @@ pub mod shell {
let hotcmd = &conf.hotkeys[&x].clone();
for c in hotcmd.chars() {
if c != '\n' {
write_letter(&mut mycommand,
&mut current_pos,
&mut max_pos,
write_letter(&mut mycommand,
&mut current_pos,
&mut max_pos,
c);
} else {
current_pos = 0;
max_pos = 0;
mycommand = transform_alias(&conf, mycommand);
run_cmd(&mut mycommand,
&mut current_number,
&mut current_number,
&mut conf,
&mut stdout);
}
@ -552,8 +553,9 @@ pub mod shell {
append_prev_arg(&mut mycommand, &mut current_pos, &mut max_pos);
},
'!' => {
let mut cmd = format!("echo -- ALIASES --> {:?}", conf.hotkeys);
run_cmd(&mut cmd, &mut current_number, &mut conf, &mut stdout);
let mut cmd = format!("\r\n-- ALIASES --> \r\n{:?}\r\n", conf.hotkeys);
cmd = cmd.replace(",", "\r\n");
write!(stdout, "{}", cmd);
},
_ => (),